Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 934253a7 authored by Shan Wei's avatar Shan Wei Committed by David S. Miller
Browse files

sctp: use memdup_user to copy data from userspace 



Use common function to simply code.

Signed-off-by: default avatarShan Wei <shanwei@cn.fujitsu.com>
Signed-off-by: default avatarVlad Yasevich <vladislav.yasevich@hp.com>
Signed-off-by: default avatarWei Yongjun <yjwei@cn.fujitsu.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 66009927

net/sctp/socket.c

+6 −16
Original line number Diff line number Diff line
@@ -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;