xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sctp: pass a kernel pointer to sctp_setsockopt_enable_strreset

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:15 +02:00
committed by David S. Miller
parent 3f49f72035
commit 356dc6f16a
1 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
net/sctp/socket.c
View File

@@ -4019,48 +4019,42 @@ out:
} }
static int sctp_setsockopt_enable_strreset(struct sock *sk, static int sctp_setsockopt_enable_strreset(struct sock *sk,
char __user *optval, struct sctp_assoc_value *params,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_endpoint *ep = sctp_sk(sk)->ep; struct sctp_endpoint *ep = sctp_sk(sk)->ep;
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)) { if (params->assoc_value & (~SCTP_ENABLE_STRRESET_MASK))
retval = -EFAULT;
goto out;
}
if (params.assoc_value & (~SCTP_ENABLE_STRRESET_MASK))
goto out; goto out;
asoc = sctp_id2assoc(sk, params.assoc_id); asoc = sctp_id2assoc(sk, params->assoc_id);
if (!asoc && params.assoc_id > SCTP_ALL_ASSOC && if (!asoc && params->assoc_id > SCTP_ALL_ASSOC &&
sctp_style(sk, UDP)) sctp_style(sk, UDP))
goto out; goto out;
retval = 0; retval = 0;
if (asoc) { if (asoc) {
asoc->strreset_enable = params.assoc_value; asoc->strreset_enable = params->assoc_value;
goto out; goto out;
} }
if (sctp_style(sk, TCP)) if (sctp_style(sk, TCP))
params.assoc_id = SCTP_FUTURE_ASSOC; params->assoc_id = SCTP_FUTURE_ASSOC;
if (params.assoc_id == SCTP_FUTURE_ASSOC || if (params->assoc_id == SCTP_FUTURE_ASSOC ||
params.assoc_id == SCTP_ALL_ASSOC) params->assoc_id == SCTP_ALL_ASSOC)
ep->strreset_enable = params.assoc_value; ep->strreset_enable = params->assoc_value;
if (params.assoc_id == SCTP_CURRENT_ASSOC || if (params->assoc_id == SCTP_CURRENT_ASSOC ||
params.assoc_id == SCTP_ALL_ASSOC) params->assoc_id == SCTP_ALL_ASSOC)
list_for_each_entry(asoc, &ep->asocs, asocs) list_for_each_entry(asoc, &ep->asocs, asocs)
asoc->strreset_enable = params.assoc_value; asoc->strreset_enable = params->assoc_value;
out: out:
return retval; return retval;
@@ -4685,7 +4679,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_reconfig_supported(sk, kopt, 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, kopt, optlen);
break; break;
case SCTP_RESET_STREAMS: case SCTP_RESET_STREAMS:
retval = sctp_setsockopt_reset_streams(sk, optval, optlen); retval = sctp_setsockopt_reset_streams(sk, optval, optlen);