aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJulia Lawall <julia@diku.dk>2010-05-21 18:26:04 -0400
committerDavid S. Miller <davem@davemloft.net>2010-05-31 03:24:14 -0400
commit7d88950426da812a6ab93ee1bba821f7f0ec1766 (patch)
treef57c4a675cd48bdb61f0b272d12a2496e2221189 /drivers/net
parent042604d2a3ee59c84f8293988caf35bac5de9eb3 (diff)
drivers/net/wan: Use memdup_user
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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/wan/farsync.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/drivers/net/wan/farsync.c b/drivers/net/wan/farsync.c
index e087b9a6daaa..43b77271532b 100644
--- a/drivers/net/wan/farsync.c
+++ b/drivers/net/wan/farsync.c
@@ -2038,16 +2038,10 @@ fst_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
2038 2038
2039 /* Now copy the data to the card. */ 2039 /* Now copy the data to the card. */
2040 2040
2041 buf = kmalloc(wrthdr.size, GFP_KERNEL); 2041 buf = memdup_user(ifr->ifr_data + sizeof(struct fstioc_write),
2042 if (!buf) 2042 wrthdr.size);
2043 return -ENOMEM; 2043 if (IS_ERR(buf))
2044 2044 return PTR_ERR(buf);
2045 if (copy_from_user(buf,
2046 ifr->ifr_data + sizeof (struct fstioc_write),
2047 wrthdr.size)) {
2048 kfree(buf);
2049 return -EFAULT;
2050 }
2051 2045
2052 memcpy_toio(card->mem + wrthdr.offset, buf, wrthdr.size); 2046 memcpy_toio(card->mem + wrthdr.offset, buf, wrthdr.size);
2053 kfree(buf); 2047 kfree(buf);