]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
sctp: use memdup_user to copy data from userspace
authorShan Wei <shanwei@cn.fujitsu.com>
Mon, 18 Apr 2011 19:13:18 +0000 (19:13 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 20 Apr 2011 04:45:20 +0000 (21:45 -0700)
Use common function to simply code.

Signed-off-by: Shan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: Vlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: Wei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/socket.c

index deb82e35a107e89b9a2328445c46bc8935a143d6..5c9980ae36bba9320296e848ed6dc26f758d98aa 100644 (file)
@@ -3215,14 +3215,9 @@ static int sctp_setsockopt_hmac_ident(struct sock *sk,
        if (optlen < sizeof(struct sctp_hmacalgo))
                return -EINVAL;
 
-       hmacs = kmalloc(optlen, GFP_KERNEL);
-       if (!hmacs)
-               return -ENOMEM;
-
-       if (copy_from_user(hmacs, optval, optlen)) {
-               err = -EFAULT;
-               goto out;
-       }
+       hmacs= memdup_user(optval, optlen);
+       if (IS_ERR(hmacs))
+               return PTR_ERR(hmacs);
 
        idents = hmacs->shmac_num_idents;
        if (idents == 0 || idents > SCTP_AUTH_NUM_HMACS ||
@@ -3257,14 +3252,9 @@ static int sctp_setsockopt_auth_key(struct sock *sk,
        if (optlen <= sizeof(struct sctp_authkey))
                return -EINVAL;
 
-       authkey = kmalloc(optlen, GFP_KERNEL);
-       if (!authkey)
-               return -ENOMEM;
-
-       if (copy_from_user(authkey, optval, optlen)) {
-               ret = -EFAULT;
-               goto out;
-       }
+       authkey= memdup_user(optval, optlen);
+       if (IS_ERR(authkey))
+               return PTR_ERR(authkey);
 
        if (authkey->sca_keylength > optlen - sizeof(struct sctp_authkey)) {
                ret = -EINVAL;