Commit d636e7f3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by David S. Miller

sctp: pass a kernel pointer to sctp_setsockopt_scheduler_value

Use the kernel pointer that sctp_setsockopt has available instead of
directly handling the user pointer.
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4d2fba3a
...@@ -4158,38 +4158,32 @@ static int sctp_setsockopt_scheduler(struct sock *sk, ...@@ -4158,38 +4158,32 @@ static int sctp_setsockopt_scheduler(struct sock *sk,
} }
static int sctp_setsockopt_scheduler_value(struct sock *sk, static int sctp_setsockopt_scheduler_value(struct sock *sk,
char __user *optval, struct sctp_stream_value *params,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_stream_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;
optlen = sizeof(params);
if (copy_from_user(&params, optval, optlen)) {
retval = -EFAULT;
goto out; goto out;
}
asoc = sctp_id2assoc(sk, params.assoc_id); asoc = sctp_id2assoc(sk, params->assoc_id);
if (!asoc && params.assoc_id != SCTP_CURRENT_ASSOC && if (!asoc && params->assoc_id != SCTP_CURRENT_ASSOC &&
sctp_style(sk, UDP)) sctp_style(sk, UDP))
goto out; goto out;
if (asoc) { if (asoc) {
retval = sctp_sched_set_value(asoc, params.stream_id, retval = sctp_sched_set_value(asoc, params->stream_id,
params.stream_value, GFP_KERNEL); params->stream_value, GFP_KERNEL);
goto out; goto out;
} }
retval = 0; retval = 0;
list_for_each_entry(asoc, &sctp_sk(sk)->ep->asocs, asocs) { list_for_each_entry(asoc, &sctp_sk(sk)->ep->asocs, asocs) {
int ret = sctp_sched_set_value(asoc, params.stream_id, int ret = sctp_sched_set_value(asoc, params->stream_id,
params.stream_value, GFP_KERNEL); params->stream_value,
GFP_KERNEL);
if (ret && !retval) /* try to return the 1st error. */ if (ret && !retval) /* try to return the 1st error. */
retval = ret; retval = ret;
} }
...@@ -4658,7 +4652,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, ...@@ -4658,7 +4652,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_scheduler(sk, kopt, optlen); retval = sctp_setsockopt_scheduler(sk, kopt, optlen);
break; break;
case SCTP_STREAM_SCHEDULER_VALUE: case SCTP_STREAM_SCHEDULER_VALUE:
retval = sctp_setsockopt_scheduler_value(sk, optval, optlen); retval = sctp_setsockopt_scheduler_value(sk, kopt, optlen);
break; break;
case SCTP_INTERLEAVING_SUPPORTED: case SCTP_INTERLEAVING_SUPPORTED:
retval = sctp_setsockopt_interleaving_supported(sk, optval, retval = sctp_setsockopt_interleaving_supported(sk, optval,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment