Skip to content

Commit

Permalink
sctp: pass a kernel pointer to sctp_setsockopt_scheduler_value
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Christoph Hellwig authored and David S. Miller committed Jul 20, 2020
1 parent 4d2fba3 commit d636e7f
Showing 1 changed file with 10 additions and 16 deletions.
26 changes: 10 additions & 16 deletions net/sctp/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -4158,38 +4158,32 @@ static int sctp_setsockopt_scheduler(struct sock *sk,
}

static int sctp_setsockopt_scheduler_value(struct sock *sk,
char __user *optval,
struct sctp_stream_value *params,
unsigned int optlen)
{
struct sctp_stream_value params;
struct sctp_association *asoc;
int retval = -EINVAL;

if (optlen < sizeof(params))
goto out;

optlen = sizeof(params);
if (copy_from_user(&params, optval, optlen)) {
retval = -EFAULT;
if (optlen < sizeof(*params))
goto out;
}

asoc = sctp_id2assoc(sk, params.assoc_id);
if (!asoc && params.assoc_id != SCTP_CURRENT_ASSOC &&
asoc = sctp_id2assoc(sk, params->assoc_id);
if (!asoc && params->assoc_id != SCTP_CURRENT_ASSOC &&
sctp_style(sk, UDP))
goto out;

if (asoc) {
retval = sctp_sched_set_value(asoc, params.stream_id,
params.stream_value, GFP_KERNEL);
retval = sctp_sched_set_value(asoc, params->stream_id,
params->stream_value, GFP_KERNEL);
goto out;
}

retval = 0;

list_for_each_entry(asoc, &sctp_sk(sk)->ep->asocs, asocs) {
int ret = sctp_sched_set_value(asoc, params.stream_id,
params.stream_value, GFP_KERNEL);
int ret = sctp_sched_set_value(asoc, params->stream_id,
params->stream_value,
GFP_KERNEL);
if (ret && !retval) /* try to return the 1st error. */
retval = ret;
}
Expand Down Expand Up @@ -4658,7 +4652,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_scheduler(sk, kopt, optlen);
break;
case SCTP_STREAM_SCHEDULER_VALUE:
retval = sctp_setsockopt_scheduler_value(sk, optval, optlen);
retval = sctp_setsockopt_scheduler_value(sk, kopt, optlen);
break;
case SCTP_INTERLEAVING_SUPPORTED:
retval = sctp_setsockopt_interleaving_supported(sk, optval,
Expand Down

0 comments on commit d636e7f

Please sign in to comment.