Skip to contentSkip to conversation

staging: dt3155: check put_user() return value

PATCH Superseded Kulikov Vasiliy 2 participants 4 messages Aug 2, 2010

Subsystems (2)
Staging Kernel janitors
lore
Share & tools
lore

Kulikov Vasiliy

author
#0 lore raw

PATCH v2 1/9 staging: dt3155: check put_user() return value

put_user() return 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 <[email protected]>
---
 drivers/staging/dt3155/dt3155_drv.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
drivers/staging/dt3155/dt3155_drv.c +8 -9
index 7316996..4013f09 100644
@@ -745,10 +745,11 @@ 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 */
-  if (count != sizeof(struct dt3155_read))
+  if (count != sizeof(dt_read))
     {
       printk(KERN_INFO "DT3155 ERROR (NJC): count is not right\n");
       return -EINVAL;

@@ -797,17 +798,15 @@ 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(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(dt_read)))
       return -EFAULT;
 
-  return sizeof(struct dt3155_read);
+  return sizeof(dt_read);
 }
 
 static unsigned int dt3155_poll (struct file * filp, poll_table *wait)
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 14 lines · Kulikov Vasiliy

put_user() return 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 <[email protected]>
---
 drivers/staging/dt3155/dt3155_drv.c |   17 ++++++++---------
 1 files changed, 8 insertions(+), 9 deletions(-)
drivers/staging/dt3155/dt3155_drv.c +0 -0
index 7316996..4013f09 100644

drivers/staging/dt3155/dt3155_drv.c static ssize_t dt3155_read(struct file *filep, char __user *buf, · line 752

Quoted 9 lines
drivers/staging/dt3155/dt3155_drv.c +2 -1
@@ -745,10 +745,11 @@ 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 */
-  if (count != sizeof(struct dt3155_read))
+  if (count != sizeof(dt_read))

I believe that sizeof(struct dt3155_read) is preferred, so this change isn't needed and sizeof(struct dt3155_read) should be used below (three times).

Quoted 29 lines
drivers/staging/dt3155/dt3155_drv.c +6 -8
     {
       printk(KERN_INFO "DT3155 ERROR (NJC): count is not right\n");
       return -EINVAL;

@@ -797,17 +798,15 @@ 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(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(dt_read)))
       return -EFAULT;
 
-  return sizeof(struct dt3155_read);
+  return sizeof(dt_read);
 }
 
 static unsigned int dt3155_poll (struct file * filp, poll_table *wait)
Signature · 1 line
1.7.0.4
author
#2 lore raw

PATCH v3 1/9 staging: dt3155: check put_user() return value

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 <[email protected]>
---
 drivers/staging/dt3155/dt3155_drv.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
drivers/staging/dt3155/dt3155_drv.c +6 -7
index 7316996..6031837 100644
@@ -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);
Signature · 1 line
1.7.0.4
Reviewed-by on v3 1/9
#3 lore raw
Quoted 5 lines · Vasiliy Kulikov

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 <[email protected]>

Looks good to me.

Reviewed-by Simon Horman <[email protected]>
Quoted 38 lines
---
 drivers/staging/dt3155/dt3155_drv.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
drivers/staging/dt3155/dt3155_drv.c +6 -7
index 7316996..6031837 100644
@@ -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);
Signature · 1 line
1.7.0.4