Skip to content

Commit

Permalink
sctp: pass a kernel pointer to sctp_setsockopt_reset_streams
Browse files Browse the repository at this point in the history
Use the kernel pointer that sctp_setsockopt has available instead of
directly handling the user pointer.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Christoph Hellwig authored and David S. Miller committed Jul 20, 2020
1 parent 356dc6f commit d492243
Showing 1 changed file with 5 additions and 15 deletions.
20 changes: 5 additions & 15 deletions net/sctp/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -4061,36 +4061,26 @@ static int sctp_setsockopt_enable_strreset(struct sock *sk,
}

static int sctp_setsockopt_reset_streams(struct sock *sk,
char __user *optval,
struct sctp_reset_streams *params,
unsigned int optlen)
{
struct sctp_reset_streams *params;
struct sctp_association *asoc;
int retval = -EINVAL;

if (optlen < sizeof(*params))
return -EINVAL;
/* srs_number_streams is u16, so optlen can't be bigger than this. */
optlen = min_t(unsigned int, optlen, USHRT_MAX +
sizeof(__u16) * sizeof(*params));

params = memdup_user(optval, optlen);
if (IS_ERR(params))
return PTR_ERR(params);

if (params->srs_number_streams * sizeof(__u16) >
optlen - sizeof(*params))
goto out;
return -EINVAL;

asoc = sctp_id2assoc(sk, params->srs_assoc_id);
if (!asoc)
goto out;

retval = sctp_send_reset_streams(asoc, params);
return -EINVAL;

out:
kfree(params);
return retval;
return sctp_send_reset_streams(asoc, params);
}

static int sctp_setsockopt_reset_assoc(struct sock *sk,
Expand Down Expand Up @@ -4682,7 +4672,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_enable_strreset(sk, kopt, optlen);
break;
case SCTP_RESET_STREAMS:
retval = sctp_setsockopt_reset_streams(sk, optval, optlen);
retval = sctp_setsockopt_reset_streams(sk, kopt, optlen);
break;
case SCTP_RESET_ASSOC:
retval = sctp_setsockopt_reset_assoc(sk, optval, optlen);
Expand Down

0 comments on commit d492243

Please sign in to comment.