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

sctp: pass a kernel pointer to sctp_setsockopt_reset_assoc

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 d4922434
...@@ -4083,30 +4083,19 @@ static int sctp_setsockopt_reset_streams(struct sock *sk, ...@@ -4083,30 +4083,19 @@ static int sctp_setsockopt_reset_streams(struct sock *sk,
return sctp_send_reset_streams(asoc, params); return sctp_send_reset_streams(asoc, params);
} }
static int sctp_setsockopt_reset_assoc(struct sock *sk, static int sctp_setsockopt_reset_assoc(struct sock *sk, sctp_assoc_t *associd,
char __user *optval,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_association *asoc; struct sctp_association *asoc;
sctp_assoc_t associd;
int retval = -EINVAL;
if (optlen != sizeof(associd))
goto out;
if (copy_from_user(&associd, optval, optlen)) { if (optlen != sizeof(*associd))
retval = -EFAULT; return -EINVAL;
goto out;
}
asoc = sctp_id2assoc(sk, associd); asoc = sctp_id2assoc(sk, *associd);
if (!asoc) if (!asoc)
goto out; return -EINVAL;
retval = sctp_send_reset_assoc(asoc);
out: return sctp_send_reset_assoc(asoc);
return retval;
} }
static int sctp_setsockopt_add_streams(struct sock *sk, static int sctp_setsockopt_add_streams(struct sock *sk,
...@@ -4675,7 +4664,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, ...@@ -4675,7 +4664,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_reset_streams(sk, kopt, optlen); retval = sctp_setsockopt_reset_streams(sk, kopt, optlen);
break; break;
case SCTP_RESET_ASSOC: case SCTP_RESET_ASSOC:
retval = sctp_setsockopt_reset_assoc(sk, optval, optlen); retval = sctp_setsockopt_reset_assoc(sk, kopt, optlen);
break; break;
case SCTP_ADD_STREAMS: case SCTP_ADD_STREAMS:
retval = sctp_setsockopt_add_streams(sk, optval, optlen); retval = sctp_setsockopt_add_streams(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