Commit 4986f3f0 authored Jul 22, 2010 by Julia Lawall Committed by David S. Miller Jul 23, 2010

qeth: 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Frank Blaschka <frank.blaschka@de.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent bbb822a8

drivers/s390/net/qeth_core_main.c

+3 −8

Original line number	Diff line number	Diff line
		@@ -3748,15 +3748,10 @@ int qeth_snmp_command(struct qeth_card card, char __user udata)
		/* skip 4 bytes (data_len struct member) to get req_len */
		if (copy_from_user(&req_len, udata + sizeof(int), sizeof(int)))
		return -EFAULT;
		ureq = kmalloc(req_len+sizeof(struct qeth_snmp_ureq_hdr), GFP_KERNEL);
		if (!ureq) {
		ureq = memdup_user(udata, req_len + sizeof(struct qeth_snmp_ureq_hdr));
		if (IS_ERR(ureq)) {
		QETH_CARD_TEXT(card, 2, "snmpnome");
		return -ENOMEM;
		}
		if (copy_from_user(ureq, udata,
		req_len + sizeof(struct qeth_snmp_ureq_hdr))) {
		kfree(ureq);
		return -EFAULT;
		return PTR_ERR(ureq);
		}
		qinfo.udata_len = ureq->hdr.data_len;
		qinfo.udata = kzalloc(qinfo.udata_len, GFP_KERNEL);