[PATCH 1/9 v3] staging: dt3155: check put_user() return value
in [Kernel]
|
Prev: hwmon/mc13783-adc: don't access struct mc13783 directly
Next: vfs: only add " (deleted)" where necessary
From: Vasiliy Kulikov on 2 Aug 2010 09:00 put_user() returns code was not checked for errors. To simplify the code fill local struct dt3155_read with data and copy it with single copy_to_user() call. Signed-off-by: Kulikov Vasiliy <segooon(a)gmail.com> --- drivers/staging/dt3155/dt3155_drv.c | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/drivers/staging/dt3155/dt3155_drv.c b/drivers/staging/dt3155/dt3155_drv.c index 7316996..6031837 100644 --- a/drivers/staging/dt3155/dt3155_drv.c +++ b/drivers/staging/dt3155/dt3155_drv.c @@ -745,6 +745,7 @@ static ssize_t dt3155_read(struct file *filep, char __user *buf, struct dt3155_status *dts = &dt3155_status[minor]; struct dt3155_fbuffer *fb = &dts->fbuffer; struct frame_info *frame_info; + struct dt3155_read dt_read; /* TODO: this should check the error flag and */ /* return an error on hardware failures */ @@ -797,14 +798,12 @@ static ssize_t dt3155_read(struct file *filep, char __user *buf, /* make this an offset */ offset = frame_info->addr - dts->mem_addr; + dt_read.offset = offset; + dt_read.frame_seq = fb->frame_count; + dt_read.state = dts->state; + memcpy(&dt_read.frame_info, frame_info, sizeof(struct frame_info)); - put_user(offset, (unsigned int __user *)buf); - buf += sizeof(u32); - put_user(fb->frame_count, (unsigned int __user *)buf); - buf += sizeof(u32); - put_user(dts->state, (unsigned int __user *)buf); - buf += sizeof(u32); - if (copy_to_user(buf, frame_info, sizeof(*frame_info))) + if (copy_to_user(buf, &dt_read, sizeof(struct dt3155_read))) return -EFAULT; return sizeof(struct dt3155_read); -- 1.7.0.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |