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

sctp: pass a kernel pointer to sctp_setsockopt_add_streams

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 b97d20ce
...@@ -4099,29 +4099,19 @@ static int sctp_setsockopt_reset_assoc(struct sock *sk, sctp_assoc_t *associd, ...@@ -4099,29 +4099,19 @@ static int sctp_setsockopt_reset_assoc(struct sock *sk, sctp_assoc_t *associd,
} }
static int sctp_setsockopt_add_streams(struct sock *sk, static int sctp_setsockopt_add_streams(struct sock *sk,
char __user *optval, struct sctp_add_streams *params,
unsigned int optlen) unsigned int optlen)
{ {
struct sctp_association *asoc; struct sctp_association *asoc;
struct sctp_add_streams params;
int retval = -EINVAL;
if (optlen != sizeof(params))
goto out;
if (copy_from_user(&params, optval, optlen)) { if (optlen != sizeof(*params))
retval = -EFAULT; return -EINVAL;
goto out;
}
asoc = sctp_id2assoc(sk, params.sas_assoc_id); asoc = sctp_id2assoc(sk, params->sas_assoc_id);
if (!asoc) if (!asoc)
goto out; return -EINVAL;
retval = sctp_send_add_streams(asoc, &params);
out: return sctp_send_add_streams(asoc, params);
return retval;
} }
static int sctp_setsockopt_scheduler(struct sock *sk, static int sctp_setsockopt_scheduler(struct sock *sk,
...@@ -4667,7 +4657,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname, ...@@ -4667,7 +4657,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_reset_assoc(sk, kopt, 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, kopt, optlen);
break; break;
case SCTP_STREAM_SCHEDULER: case SCTP_STREAM_SCHEDULER:
retval = sctp_setsockopt_scheduler(sk, optval, optlen); retval = sctp_setsockopt_scheduler(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