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

sctp: pass a kernel pointer to sctp_setsockopt_context

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:21:58 +02:00
committed by David S. Miller
parent 07e5035c6f
commit 722eca9eca
1 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
net/sctp/socket.c
View File

@@ -3362,40 +3362,38 @@ static int sctp_setsockopt_adaptation_layer(struct sock *sk,
* received messages from the peer and does not effect the value that is * received messages from the peer and does not effect the value that is
* saved with outbound messages. * saved with outbound messages.
*/ */
static int sctp_setsockopt_context(struct sock *sk, char __user *optval, static int sctp_setsockopt_context(struct sock *sk,
struct sctp_assoc_value *params,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_sock *sp = sctp_sk(sk); struct sctp_sock *sp = sctp_sk(sk);
struct sctp_assoc_value params;
struct sctp_association *asoc; struct sctp_association *asoc;
if (optlen != sizeof(struct sctp_assoc_value)) if (optlen != sizeof(struct sctp_assoc_value))
return -EINVAL; return -EINVAL;
if (copy_from_user(&params, optval, optlen))
return -EFAULT;
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))
return -EINVAL; return -EINVAL;
if (asoc) { if (asoc) {
asoc->default_rcv_context = params.assoc_value; asoc->default_rcv_context = params->assoc_value;
return 0; return 0;
} }
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)
sp->default_rcv_context = params.assoc_value; sp->default_rcv_context = 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, &sp->ep->asocs, asocs) list_for_each_entry(asoc, &sp->ep->asocs, asocs)
asoc->default_rcv_context = params.assoc_value; asoc->default_rcv_context = params->assoc_value;
return 0; return 0;
} }
@@ -4700,7 +4698,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_adaptation_layer(sk, kopt, optlen); retval = sctp_setsockopt_adaptation_layer(sk, kopt, optlen);
break; break;
case SCTP_CONTEXT: case SCTP_CONTEXT:
retval = sctp_setsockopt_context(sk, optval, optlen); retval = sctp_setsockopt_context(sk, kopt, optlen);
break; break;
case SCTP_FRAGMENT_INTERLEAVE: case SCTP_FRAGMENT_INTERLEAVE:
retval = sctp_setsockopt_fragment_interleave(sk, optval, optlen); retval = sctp_setsockopt_fragment_interleave(sk, optval, optlen);