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

sctp: pass a kernel pointer to sctp_setsockopt_interleaving_supported

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 d636e7f3
...@@ -4193,39 +4193,25 @@ static int sctp_setsockopt_scheduler_value(struct sock *sk, ...@@ -4193,39 +4193,25 @@ static int sctp_setsockopt_scheduler_value(struct sock *sk,
} }
static int sctp_setsockopt_interleaving_supported(struct sock *sk, static int sctp_setsockopt_interleaving_supported(struct sock *sk,
char __user *optval, struct sctp_assoc_value *p,
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;
int retval = -EINVAL;
if (optlen < sizeof(params)) if (optlen < sizeof(*p))
goto out; return -EINVAL;
optlen = sizeof(params);
if (copy_from_user(&params, optval, optlen)) {
retval = -EFAULT;
goto out;
}
asoc = sctp_id2assoc(sk, params.assoc_id); asoc = sctp_id2assoc(sk, p->assoc_id);
if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC && if (!asoc && p->assoc_id != SCTP_FUTURE_ASSOC && sctp_style(sk, UDP))
sctp_style(sk, UDP)) return -EINVAL;
goto out;
if (!sock_net(sk)->sctp.intl_enable || !sp->frag_interleave) { if (!sock_net(sk)->sctp.intl_enable || !sp->frag_interleave) {
retval = -EPERM; return -EPERM;
goto out;
} }
sp->ep->intl_enable = !!params.assoc_value; sp->ep->intl_enable = !!p->assoc_value;
return 0;
retval = 0;
out:
return retval;
} }
static int sctp_setsockopt_reuse_port(struct sock *sk, char __user *optval, static int sctp_setsockopt_reuse_port(struct sock *sk, char __user *optval,
...@@ -4655,7 +4641,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, ...@@ -4655,7 +4641,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_scheduler_value(sk, kopt, 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, kopt,
optlen); optlen);
break; break;
case SCTP_REUSE_PORT: case SCTP_REUSE_PORT:
......
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