The patch titled mm: use memdup_user has been added to the -mm tree. Its filename is mm-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: mm: use memdup_user From: Julia Lawall <julia@xxxxxxx> 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@xxxxxxx> Cc: KOSAKI Motohiro <kosaki.motohiro@xxxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/util.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff -puN mm/util.c~mm-use-memdup_user mm/util.c --- a/mm/util.c~mm-use-memdup_user +++ a/mm/util.c @@ -225,15 +225,10 @@ char *strndup_user(const char __user *s, if (length > n) return ERR_PTR(-EINVAL); - p = kmalloc(length, GFP_KERNEL); + p = memdup_user(s, length); - if (!p) - return ERR_PTR(-ENOMEM); - - if (copy_from_user(p, s, length)) { - kfree(p); - return ERR_PTR(-EFAULT); - } + if (IS_ERR(p)) + return p; p[length - 1] = '\0'; _ 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