From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + drivers-ieee1394-use-memdup_user.patch added to -mm tree Date: Tue, 25 May 2010 15:36:51 -0700 Message-ID: <201005252236.o4PMapi7019081@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp1.linux-foundation.org ([140.211.169.13]:43151 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758535Ab0EYWjv (ORCPT ); Tue, 25 May 2010 18:39:51 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: julia@diku.dk, stefanr@s5r6.in-berlin.de The patch titled drivers/ieee1394: use memdup_user has been added to the -mm tree. Its filename is drivers-ieee1394-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/ieee1394: use memdup_user From: Julia Lawall 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/) // @@ 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 - ...+> - } // Signed-off-by: Julia Lawall Cc: Stefan Richter Signed-off-by: Andrew Morton --- drivers/ieee1394/video1394.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff -puN drivers/ieee1394/video1394.c~drivers-ieee1394-use-memdup_user drivers/ieee1394/video1394.c --- a/drivers/ieee1394/video1394.c~drivers-ieee1394-use-memdup_user +++ a/drivers/ieee1394/video1394.c @@ -1045,14 +1045,9 @@ static long video1394_ioctl(struct file if (get_user(qv, &p->packet_sizes)) return -EFAULT; - psizes = kmalloc(buf_size, GFP_KERNEL); - if (!psizes) - return -ENOMEM; - - if (copy_from_user(psizes, qv, buf_size)) { - kfree(psizes); - return -EFAULT; - } + psizes = memdup_user(qv, buf_size); + if (IS_ERR(psizes)) + return PTR_ERR(psizes); } spin_lock_irqsave(&d->lock,flags); _ Patches currently in -mm which might be from julia@diku.dk 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