renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-04 11:43:54 +08:00
Code

sctp: pass a kernel pointer to sctp_setsockopt_del_key

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:06 +02:00 committed by David S. Miller
parent dcab0a7a57
commit 97dc9f2e3e
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
net/sctp/socket.c
View File

@ -3703,42 +3703,39 @@ static int sctp_setsockopt_active_key(struct sock *sk,
* This set option will delete a shared secret key from use. * This set option will delete a shared secret key from use.
*/ */
static int sctp_setsockopt_del_key(struct sock *sk, static int sctp_setsockopt_del_key(struct sock *sk,
char __user *optval, struct sctp_authkeyid *val,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_endpoint *ep = sctp_sk(sk)->ep; struct sctp_endpoint *ep = sctp_sk(sk)->ep;
struct sctp_association *asoc; struct sctp_association *asoc;
struct sctp_authkeyid val;
int ret = 0; int ret = 0;
if (optlen != sizeof(struct sctp_authkeyid)) if (optlen != sizeof(struct sctp_authkeyid))
return -EINVAL; return -EINVAL;
if (copy_from_user(&val, optval, optlen))
return -EFAULT;
asoc = sctp_id2assoc(sk, val.scact_assoc_id); asoc = sctp_id2assoc(sk, val->scact_assoc_id);
if (!asoc && val.scact_assoc_id > SCTP_ALL_ASSOC && if (!asoc && val->scact_assoc_id > SCTP_ALL_ASSOC &&
sctp_style(sk, UDP)) sctp_style(sk, UDP))
return -EINVAL; return -EINVAL;
if (asoc) if (asoc)
return sctp_auth_del_key_id(ep, asoc, val.scact_keynumber); return sctp_auth_del_key_id(ep, asoc, val->scact_keynumber);
if (sctp_style(sk, TCP)) if (sctp_style(sk, TCP))
val.scact_assoc_id = SCTP_FUTURE_ASSOC; val->scact_assoc_id = SCTP_FUTURE_ASSOC;
if (val.scact_assoc_id == SCTP_FUTURE_ASSOC || if (val->scact_assoc_id == SCTP_FUTURE_ASSOC ||
val.scact_assoc_id == SCTP_ALL_ASSOC) { val->scact_assoc_id == SCTP_ALL_ASSOC) {
ret = sctp_auth_del_key_id(ep, asoc, val.scact_keynumber); ret = sctp_auth_del_key_id(ep, asoc, val->scact_keynumber);
if (ret) if (ret)
return ret; return ret;
} }
if (val.scact_assoc_id == SCTP_CURRENT_ASSOC || if (val->scact_assoc_id == SCTP_CURRENT_ASSOC ||
val.scact_assoc_id == SCTP_ALL_ASSOC) { val->scact_assoc_id == SCTP_ALL_ASSOC) {
list_for_each_entry(asoc, &ep->asocs, asocs) { list_for_each_entry(asoc, &ep->asocs, asocs) {
int res = sctp_auth_del_key_id(ep, asoc, int res = sctp_auth_del_key_id(ep, asoc,
val.scact_keynumber); val->scact_keynumber);
if (res && !ret) if (res && !ret)
ret = res; ret = res;
@ -4689,7 +4686,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_active_key(sk, kopt, optlen); retval = sctp_setsockopt_active_key(sk, kopt, optlen);
break; break;
case SCTP_AUTH_DELETE_KEY: case SCTP_AUTH_DELETE_KEY:
retval = sctp_setsockopt_del_key(sk, optval, optlen); retval = sctp_setsockopt_del_key(sk, kopt, optlen);
break; break;
case SCTP_AUTH_DEACTIVATE_KEY: case SCTP_AUTH_DEACTIVATE_KEY:
retval = sctp_setsockopt_deactivate_key(sk, optval, optlen); retval = sctp_setsockopt_deactivate_key(sk, optval, optlen);