Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-24 06:01:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

sctp: use memdup_user to copy data from userspace

Browse Source 
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>
This commit is contained in:
Shan Wei 2011-04-18 19:13:18 +00:00 committed by David S. Miller
parent 66009927f1
commit 934253a7b4
1 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
net/sctp/socket.c
View File

@ -3215,14 +3215,9 @@ static int sctp_setsockopt_hmac_ident(struct sock *sk,
if (optlen < sizeof(struct sctp_hmacalgo)) if (optlen < sizeof(struct sctp_hmacalgo))
return -EINVAL; return -EINVAL;
hmacs = kmalloc(optlen, GFP_KERNEL); hmacs= memdup_user(optval, optlen);
if (!hmacs) if (IS_ERR(hmacs))
return -ENOMEM; return PTR_ERR(hmacs);
if (copy_from_user(hmacs, optval, optlen)) {
err = -EFAULT;
goto out;
}
idents = hmacs->shmac_num_idents; idents = hmacs->shmac_num_idents;
if (idents == 0 || idents > SCTP_AUTH_NUM_HMACS || 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)) if (optlen <= sizeof(struct sctp_authkey))
return -EINVAL; return -EINVAL;
authkey = kmalloc(optlen, GFP_KERNEL); authkey= memdup_user(optval, optlen);
if (!authkey) if (IS_ERR(authkey))
return -ENOMEM; return PTR_ERR(authkey);
if (copy_from_user(authkey, optval, optlen)) {
ret = -EFAULT;
goto out;
}
if (authkey->sca_keylength > optlen - sizeof(struct sctp_authkey)) { if (authkey->sca_keylength > optlen - sizeof(struct sctp_authkey)) {
ret = -EINVAL; ret = -EINVAL;