The patch titled drivers/i2c: use memdup_user has been added to the -mm tree. Its filename is drivers-i2c-use-memdup_user.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://userweb.kernel.org/~akpm/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: drivers/i2c: use memdup_user From: Julia Lawall <julia@xxxxxxx> 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@xxxxxxx> Cc: Jean Delvare <khali@xxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/i2c/i2c-dev.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff -puN drivers/i2c/i2c-dev.c~drivers-i2c-use-memdup_user drivers/i2c/i2c-dev.c --- a/drivers/i2c/i2c-dev.c~drivers-i2c-use-memdup_user +++ a/drivers/i2c/i2c-dev.c @@ -167,13 +167,9 @@ static ssize_t i2cdev_write(struct file if (count > 8192) count = 8192; - tmp = kmalloc(count, GFP_KERNEL); - if (tmp == NULL) - return -ENOMEM; - if (copy_from_user(tmp, buf, count)) { - kfree(tmp); - return -EFAULT; - } + tmp = memdup_user(buf, count); + if (IS_ERR(tmp)) + return PTR_ERR(tmp); pr_debug("i2c-dev: i2c-%d writing %zu bytes.\n", iminor(file->f_path.dentry->d_inode), count); @@ -247,15 +243,9 @@ static noinline int i2cdev_ioctl_rdrw(st break; } data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf; - rdwr_pa[i].buf = kmalloc(rdwr_pa[i].len, GFP_KERNEL); - if (rdwr_pa[i].buf == NULL) { - res = -ENOMEM; - break; - } - if (copy_from_user(rdwr_pa[i].buf, data_ptrs[i], - rdwr_pa[i].len)) { - ++i; /* Needs to be kfreed too */ - res = -EFAULT; + rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len); + if (IS_ERR(rdwr_pa[i].buf)) { + res = PTR_ERR(rdwr_pa[i].buf); break; } } _ Patches currently in -mm which might be from julia@xxxxxxx are origin.patch linux-next.patch drivers-scsi-aacraid-eliminate-use-after-free.patch arch-x86-pci-use-kasprintf.patch drivers-scsi-libsas-use-sam_good.patch drivers-scsi-remove-unnecessary-null-test.patch drivers-message-move-dereference-after-null-test.patch drivers-scsi-correct-the-size-argument-to-kmalloc.patch drivers-char-ppdevc-use-kasprintf.patch net-can-use-memdup_user.patch drivers-net-use-memdup_user.patch fs-btrfs-use-memdup_user.patch drivers-video-via-use-memdup_user.patch mm-use-memdup_user.patch drivers-net-cxgb3-use-memdup_user.patch drivers-net-wan-use-memdup_user.patch drivers-block-use-memdup_user.patch drivers-media-use-memdup_user.patch drivers-infiniband-core-use-memdup_user.patch drivers-i2c-use-memdup_user.patch drivers-ieee1394-use-memdup_user.patch fs-autofs4-use-memdup_user.patch drivers-scsi-use-memdup_user.patch drivers-char-applicomc-use-memdup_user.patch drivers-char-vtc-use-memdup_user.patch drivers-message-i2o-i2o_configc-use-memdup_user.patch drivers-telephony-ixjc-use-memdup_user.patch drivers-s390-net-use-memdup_user.patch drivers-ide-use-memdup_user.patch net-dccp-use-memdup_user.patch drivers-net-wireless-prism54-use-memdup_user.patch drivers-usb-gadget-use-memdup_user.patch drivers-isdn-use-memdup_user.patch drivers-staging-dream-camera-use-memdup_user.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html