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

sctp: pass a kernel pointer to sctp_setsockopt_reset_assoc

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:17 +02:00 committed by David S. Miller
parent d492243435
commit b97d20ce53
1 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
net/sctp/socket.c
View File

@ -4083,30 +4083,19 @@ static int sctp_setsockopt_reset_streams(struct sock *sk,
return sctp_send_reset_streams(asoc, params); return sctp_send_reset_streams(asoc, params);
} }
static int sctp_setsockopt_reset_assoc(struct sock *sk, static int sctp_setsockopt_reset_assoc(struct sock *sk, sctp_assoc_t *associd,
char __user *optval,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_association *asoc; struct sctp_association *asoc;
sctp_assoc_t associd;
int retval = -EINVAL;
if (optlen != sizeof(associd)) if (optlen != sizeof(*associd))
goto out; return -EINVAL;
if (copy_from_user(&associd, optval, optlen)) { asoc = sctp_id2assoc(sk, *associd);
retval = -EFAULT;
goto out;
}
asoc = sctp_id2assoc(sk, associd);
if (!asoc) if (!asoc)
goto out; return -EINVAL;
retval = sctp_send_reset_assoc(asoc); return sctp_send_reset_assoc(asoc);
out:
return retval;
} }
static int sctp_setsockopt_add_streams(struct sock *sk, static int sctp_setsockopt_add_streams(struct sock *sk,
@ -4675,7 +4664,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_reset_streams(sk, kopt, optlen); retval = sctp_setsockopt_reset_streams(sk, kopt, optlen);
break; break;
case SCTP_RESET_ASSOC: case SCTP_RESET_ASSOC:
retval = sctp_setsockopt_reset_assoc(sk, optval, optlen); retval = sctp_setsockopt_reset_assoc(sk, kopt, optlen);
break; break;
case SCTP_ADD_STREAMS: case SCTP_ADD_STREAMS:
retval = sctp_setsockopt_add_streams(sk, optval, optlen); retval = sctp_setsockopt_add_streams(sk, optval, optlen);