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

sctp: pass a kernel pointer to sctp_setsockopt_auth_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 9263ac97
...@@ -4326,29 +4326,23 @@ static int sctp_setsockopt_asconf_supported(struct sock *sk, ...@@ -4326,29 +4326,23 @@ static int sctp_setsockopt_asconf_supported(struct sock *sk,
} }
static int sctp_setsockopt_auth_supported(struct sock *sk, static int sctp_setsockopt_auth_supported(struct sock *sk,
char __user *optval, struct sctp_assoc_value *params,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_assoc_value params;
struct sctp_association *asoc; struct sctp_association *asoc;
struct sctp_endpoint *ep; struct sctp_endpoint *ep;
int retval = -EINVAL; int retval = -EINVAL;
if (optlen != sizeof(params)) if (optlen != sizeof(*params))
goto out;
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_FUTURE_ASSOC && if (!asoc && params->assoc_id != SCTP_FUTURE_ASSOC &&
sctp_style(sk, UDP)) sctp_style(sk, UDP))
goto out; goto out;
ep = sctp_sk(sk)->ep; ep = sctp_sk(sk)->ep;
if (params.assoc_value) { if (params->assoc_value) {
retval = sctp_auth_init(ep, GFP_KERNEL); retval = sctp_auth_init(ep, GFP_KERNEL);
if (retval) if (retval)
goto out; goto out;
...@@ -4358,7 +4352,7 @@ static int sctp_setsockopt_auth_supported(struct sock *sk, ...@@ -4358,7 +4352,7 @@ static int sctp_setsockopt_auth_supported(struct sock *sk,
} }
} }
ep->auth_enable = !!params.assoc_value; ep->auth_enable = !!params->assoc_value;
retval = 0; retval = 0;
out: out:
...@@ -4638,7 +4632,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, ...@@ -4638,7 +4632,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_asconf_supported(sk, kopt, optlen); retval = sctp_setsockopt_asconf_supported(sk, kopt, optlen);
break; break;
case SCTP_AUTH_SUPPORTED: case SCTP_AUTH_SUPPORTED:
retval = sctp_setsockopt_auth_supported(sk, optval, optlen); retval = sctp_setsockopt_auth_supported(sk, kopt, optlen);
break; break;
case SCTP_ECN_SUPPORTED: case SCTP_ECN_SUPPORTED:
retval = sctp_setsockopt_ecn_supported(sk, optval, optlen); retval = sctp_setsockopt_ecn_supported(sk, optval, optlen);
......
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