net/dccp: Use memdup_user
in [Kernel]
|
Prev: acquire_console_mutex: WARNING: at 2.6.33.4-rt20/kernel/mutex-debug.c:65 mutex_remove_waiter+0xe8/0x11c()
Next: [Patch 1/4] Allow arch-specific cleanup before breakpoint unregistration
From: Gerrit Renker on 25 May 2010 07:40 | Signed-off-by: Julia Lawall <julia(a)diku.dk> Acked-by: Gerrit Renker <gerrit(a)erg.abdn.ac.uk> | | --- | net/dccp/proto.c | 11 +++-------- | 1 file 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) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: David Miller on 31 May 2010 03:40
From: Julia Lawall <julia(a)diku.dk> Date: Sat, 22 May 2010 10:25:19 +0200 (CEST) > From: Julia Lawall <julia(a)diku.dk> > > 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/) ... > Signed-off-by: Julia Lawall <julia(a)diku.dk> Applied. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |