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

sctp: pass a kernel pointer to sctp_setsockopt_auth_chunk

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 f5bee0ad
...@@ -3535,21 +3535,18 @@ static int sctp_setsockopt_maxburst(struct sock *sk, ...@@ -3535,21 +3535,18 @@ static int sctp_setsockopt_maxburst(struct sock *sk,
* will only effect future associations on the socket. * will only effect future associations on the socket.
*/ */
static int sctp_setsockopt_auth_chunk(struct sock *sk, static int sctp_setsockopt_auth_chunk(struct sock *sk,
char __user *optval, struct sctp_authchunk *val,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_endpoint *ep = sctp_sk(sk)->ep; struct sctp_endpoint *ep = sctp_sk(sk)->ep;
struct sctp_authchunk val;
if (!ep->auth_enable) if (!ep->auth_enable)
return -EACCES; return -EACCES;
if (optlen != sizeof(struct sctp_authchunk)) if (optlen != sizeof(struct sctp_authchunk))
return -EINVAL; return -EINVAL;
if (copy_from_user(&val, optval, optlen))
return -EFAULT;
switch (val.sauth_chunk) { switch (val->sauth_chunk) {
case SCTP_CID_INIT: case SCTP_CID_INIT:
case SCTP_CID_INIT_ACK: case SCTP_CID_INIT_ACK:
case SCTP_CID_SHUTDOWN_COMPLETE: case SCTP_CID_SHUTDOWN_COMPLETE:
...@@ -3558,7 +3555,7 @@ static int sctp_setsockopt_auth_chunk(struct sock *sk, ...@@ -3558,7 +3555,7 @@ static int sctp_setsockopt_auth_chunk(struct sock *sk,
} }
/* add this chunk id to the endpoint */ /* add this chunk id to the endpoint */
return sctp_auth_ep_add_chunkid(ep, val.sauth_chunk); return sctp_auth_ep_add_chunkid(ep, val->sauth_chunk);
} }
/* /*
...@@ -4699,7 +4696,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, ...@@ -4699,7 +4696,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_maxburst(sk, kopt, optlen); retval = sctp_setsockopt_maxburst(sk, kopt, optlen);
break; break;
case SCTP_AUTH_CHUNK: case SCTP_AUTH_CHUNK:
retval = sctp_setsockopt_auth_chunk(sk, optval, optlen); retval = sctp_setsockopt_auth_chunk(sk, kopt, optlen);
break; break;
case SCTP_HMAC_IDENT: case SCTP_HMAC_IDENT:
retval = sctp_setsockopt_hmac_ident(sk, optval, optlen); retval = sctp_setsockopt_hmac_ident(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