diff options
| author | Julia Lawall <julia@diku.dk> | 2010-05-21 22:25:19 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-31 00:24:14 -0700 |
| commit | 042604d2a3ee59c84f8293988caf35bac5de9eb3 (patch) | |
| tree | e34f3eb3211ed0c6ab69cda79ebe66e6752d106d /net/dccp | |
| parent | c146fc9fc9bc1dc0f629fe83d49f32ab0f11bfdc (diff) | |
| download | kernel_samsung_crespo-042604d2a3ee59c84f8293988caf35bac5de9eb3.zip kernel_samsung_crespo-042604d2a3ee59c84f8293988caf35bac5de9eb3.tar.gz kernel_samsung_crespo-042604d2a3ee59c84f8293988caf35bac5de9eb3.tar.bz2 | |
net/dccp: 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>
Acked-by: Gerrit Renker <gerrit@erg.abdn.ac.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/dccp')
| -rw-r--r-- | net/dccp/proto.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/net/dccp/proto.c b/net/dccp/proto.c index b03ecf6..f79bcef 100644 --- a/net/dccp/proto.c +++ b/net/dccp/proto.c @@ -473,14 +473,9 @@ static int dccp_setsockopt_ccid(struct sock *sk, int type, if (optlen < 1 || optlen > DCCP_FEAT_MAX_SP_VALS) return -EINVAL; - val = kmalloc(optlen, GFP_KERNEL); - if (val == NULL) - return -ENOMEM; - - if (copy_from_user(val, optval, optlen)) { - kfree(val); - return -EFAULT; - } + val = memdup_user(optval, optlen); + if (IS_ERR(val)) + return PTR_ERR(val); lock_sock(sk); if (type == DCCP_SOCKOPT_TX_CCID || type == DCCP_SOCKOPT_CCID) |