aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-08-11 12:20:55 -0400
committerJean Delvare <khali@linux-fr.org>2010-08-11 12:20:55 -0400
commitf1c2e33c295de423db5740647bfaa5e2ad139192 (patch)
tree82d2d788d711d012a816dbab4d62fb5bcd2a8e87 /drivers/i2c
parent35a56c5b821c1a5ab904018f322a8e45afd116f0 (diff)
i2c-dev: Use memdup_user
Use memdup_user when user data is immediately copied into the allocated region. Note that in the second case, the ++i is no longer necessary, as the last value is already freed if needed by the call to memdup_user. 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: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/i2c-dev.c22
1 files changed, 6 insertions, 16 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
index b3fcb59a5a10..0b0427f7d348 100644
--- a/drivers/i2c/i2c-dev.c
+++ b/drivers/i2c/i2c-dev.c
@@ -167,13 +167,9 @@ static ssize_t i2cdev_write(struct file *file, const char __user *buf,
167 if (count > 8192) 167 if (count > 8192)
168 count = 8192; 168 count = 8192;
169 169
170 tmp = kmalloc(count, GFP_KERNEL); 170 tmp = memdup_user(buf, count);
171 if (tmp == NULL) 171 if (IS_ERR(tmp))
172 return -ENOMEM; 172 return PTR_ERR(tmp);
173 if (copy_from_user(tmp, buf, count)) {
174 kfree(tmp);
175 return -EFAULT;
176 }
177 173
178 pr_debug("i2c-dev: i2c-%d writing %zu bytes.\n", 174 pr_debug("i2c-dev: i2c-%d writing %zu bytes.\n",
179 iminor(file->f_path.dentry->d_inode), count); 175 iminor(file->f_path.dentry->d_inode), count);
@@ -245,15 +241,9 @@ static noinline int i2cdev_ioctl_rdrw(struct i2c_client *client,
245 break; 241 break;
246 } 242 }
247 data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf; 243 data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf;
248 rdwr_pa[i].buf = kmalloc(rdwr_pa[i].len, GFP_KERNEL); 244 rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len);
249 if (rdwr_pa[i].buf == NULL) { 245 if (IS_ERR(rdwr_pa[i].buf)) {
250 res = -ENOMEM; 246 res = PTR_ERR(rdwr_pa[i].buf);
251 break;
252 }
253 if (copy_from_user(rdwr_pa[i].buf, data_ptrs[i],
254 rdwr_pa[i].len)) {
255 ++i; /* Needs to be kfreed too */
256 res = -EFAULT;
257 break; 247 break;
258 } 248 }
259 } 249 }