[PATCH v2] drivers/media/video/v4l2-compat-ioctl32.c: Check the return value of copy_to_user

From: Thiago Farina
Date: Tue Dec 21 2010 - 18:49:07 EST


This fix the following warning:
drivers/media/video/v4l2-compat-ioctl32.c: In function âget_microcode32â:
drivers/media/video/v4l2-compat-ioctl32.c:209: warning: ignoring return value of âcopy_to_userâ, declared with attribute warn_unused_result

Signed-off-by: Thiago Farina <tfransosi@xxxxxxxxx>
---
Changes from v1:
- Check the return code of put_user too.
- Remove the obsolete comment.

drivers/media/video/v4l2-compat-ioctl32.c | 14 ++++++--------
1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c
index e30e8df..6f2a022 100644
--- a/drivers/media/video/v4l2-compat-ioctl32.c
+++ b/drivers/media/video/v4l2-compat-ioctl32.c
@@ -201,14 +201,12 @@ static struct video_code __user *get_microcode32(struct video_code32 *kp)

up = compat_alloc_user_space(sizeof(*up));

- /*
- * NOTE! We don't actually care if these fail. If the
- * user address is invalid, the native ioctl will do
- * the error handling for us
- */
- (void) copy_to_user(up->loadwhat, kp->loadwhat, sizeof(up->loadwhat));
- (void) put_user(kp->datasize, &up->datasize);
- (void) put_user(compat_ptr(kp->data), &up->data);
+ if (copy_to_user(up->loadwhat, kp->loadwhat, sizeof(up->loadwhat)))
+ return NULL;
+ if (put_user(kp->datasize, &up->datasize))
+ return NULL;
+ if (put_user(compat_ptr(kp->data), &up->data))
+ return NULL;
return up;
}

--
1.7.3.2.343.g7d43d

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/