leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sctp: pass a kernel pointer to sctp_setsockopt_event

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:24 +02:00
committed by David S. Miller
parent 565059cb9b
commit 9263ac97af
1 changed files with 6 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
net/sctp/socket.c
View File

@@ -4296,29 +4296,23 @@ static int sctp_setsockopt_event(struct sock *sk, struct sctp_event *param,
} }
static int sctp_setsockopt_asconf_supported(struct sock *sk, static int sctp_setsockopt_asconf_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;
struct sctp_endpoint *ep; struct sctp_endpoint *ep;
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;
ep = sctp_sk(sk)->ep; ep = sctp_sk(sk)->ep;
ep->asconf_enable = !!params.assoc_value; ep->asconf_enable = !!params->assoc_value;
if (ep->asconf_enable && ep->auth_enable) { if (ep->asconf_enable && ep->auth_enable) {
sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF); sctp_auth_ep_add_chunkid(ep, SCTP_CID_ASCONF);
@@ -4641,7 +4635,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_event(sk, kopt, optlen); retval = sctp_setsockopt_event(sk, kopt, optlen);
break; break;
case SCTP_ASCONF_SUPPORTED: case SCTP_ASCONF_SUPPORTED:
retval = sctp_setsockopt_asconf_supported(sk, optval, optlen); retval = sctp_setsockopt_asconf_supported(sk, kopt, optlen);
break; break;
case SCTP_AUTH_SUPPORTED: case SCTP_AUTH_SUPPORTED:
retval = sctp_setsockopt_auth_supported(sk, optval, optlen); retval = sctp_setsockopt_auth_supported(sk, optval, optlen);