Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-19 01:23:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Staging: dream: camera: Use memdup_user

Browse Source 
Use memdup_user when user data is immediately copied into the
allocated region.

The semantic patch that makes this change is as follows:
(http://coccinelle.lip6.fr/)

// <smpl>
@@
expression from,to,size,flag;
position p;
identifier l1,l2;
@@

-  to = \(kmalloc@p\|kzalloc@p\)(size,flag);
+  to = memdup_user(from,size);
   if (
-      to==NULL
+      IS_ERR(to)
                 || ...) {
   <+... when != goto l1;
-  -ENOMEM
+  PTR_ERR(to)
   ...+>
   }
-  if (copy_from_user(to, from, size) != 0) {
-    <+... when != goto l2;
-    -EFAULT
-    ...+>
-  }
// </smpl>

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Julia Lawall 2010-05-22 10:27:02 +02:00 committed by Greg Kroah-Hartman
parent 7c0ace5488
commit 37a18632b0
1 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
drivers/staging/dream/camera/msm_vfe8x.c
View File

@ -644,17 +644,10 @@ static int vfe_config(struct msm_vfe_cfg_cmd *cmd, void *data)
if (!axid)
return -EFAULT;
axio =
kmalloc(sizeof(struct vfe_cmd_axi_output_config),
GFP_ATOMIC);
if (!axio)
return -ENOMEM;
if (copy_from_user(axio, (void __user *)(vfecmd.value),
sizeof(struct vfe_cmd_axi_output_config))) {
kfree(axio);
return -EFAULT;
}
axio = memdup_user((void __user *)(vfecmd.value),
sizeof(struct vfe_cmd_axi_output_config));
if (IS_ERR(axio))
return PTR_ERR(axio);
vfe_config_axi(OUTPUT_1, axid, axio);
vfe_axi_output_config(axio);
@ -669,17 +662,10 @@ static int vfe_config(struct msm_vfe_cfg_cmd *cmd, void *data)
if (!axid)
return -EFAULT;
axio =
kmalloc(sizeof(struct vfe_cmd_axi_output_config),
GFP_ATOMIC);
if (!axio)
return -ENOMEM;
if (copy_from_user(axio, (void __user *)(vfecmd.value),
sizeof(struct vfe_cmd_axi_output_config))) {
kfree(axio);
return -EFAULT;
}
axio = memdup_user((void __user *)(vfecmd.value),
sizeof(struct vfe_cmd_axi_output_config));
if (IS_ERR(axio))
return PTR_ERR(axio);
vfe_config_axi(OUTPUT_2, axid, axio);
@ -694,17 +680,10 @@ static int vfe_config(struct msm_vfe_cfg_cmd *cmd, void *data)
if (!axid)
return -EFAULT;
axio =
kmalloc(sizeof(struct vfe_cmd_axi_output_config),
GFP_ATOMIC);
if (!axio)
return -ENOMEM;
if (copy_from_user(axio, (void __user *)(vfecmd.value),
sizeof(struct vfe_cmd_axi_output_config))) {
kfree(axio);
return -EFAULT;
}
axio = memdup_user((void __user *)(vfecmd.value),
sizeof(struct vfe_cmd_axi_output_config));
if (IS_ERR(axio))
return PTR_ERR(axio);
vfe_config_axi(OUTPUT_1_AND_2,
axid, axio);