Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-09-23 00:13:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

sctp: pass a kernel pointer to sctp_setsockopt_reconfig_supported

Browse Source 
Use the kernel pointer that sctp_setsockopt has available instead of
directly handling the user pointer.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2020-07-19 09:22:14 +02:00 committed by David S. Miller
parent ac37435bfe
commit 3f49f72035
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
net/sctp/socket.c
View File

@ -3996,27 +3996,21 @@ out:
} }
static int sctp_setsockopt_reconfig_supported(struct sock *sk, static int sctp_setsockopt_reconfig_supported(struct sock *sk,
char __user *optval, struct sctp_assoc_value *params,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_assoc_value params;
struct sctp_association *asoc; struct sctp_association *asoc;
int retval = -EINVAL; int retval = -EINVAL;
if (optlen != sizeof(params)) if (optlen != sizeof(*params))
goto out; goto out;
if (copy_from_user(&params, optval, optlen)) { asoc = sctp_id2assoc(sk, params->assoc_id);
retval = -EFAULT; if (!asoc && params->assoc_id != SCTP_FUTURE_ASSOC &&
goto out;
}
asoc = sctp_id2assoc(sk, params.assoc_id);
if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
sctp_style(sk, UDP)) sctp_style(sk, UDP))
goto out; goto out;
sctp_sk(sk)->ep->reconf_enable = !!params.assoc_value; sctp_sk(sk)->ep->reconf_enable = !!params->assoc_value;
retval = 0; retval = 0;
@ -4688,7 +4682,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_default_prinfo(sk, kopt, optlen); retval = sctp_setsockopt_default_prinfo(sk, kopt, optlen);
break; break;
case SCTP_RECONFIG_SUPPORTED: case SCTP_RECONFIG_SUPPORTED:
retval = sctp_setsockopt_reconfig_supported(sk, optval, optlen); retval = sctp_setsockopt_reconfig_supported(sk, kopt, optlen);
break; break;
case SCTP_ENABLE_STREAM_RESET: case SCTP_ENABLE_STREAM_RESET:
retval = sctp_setsockopt_enable_strreset(sk, optval, optlen); retval = sctp_setsockopt_enable_strreset(sk, optval, optlen);