Skip to content

Commit

Permalink
sctp: pass a kernel pointer to sctp_setsockopt_reset_assoc
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 d492243 commit b97d20c
Showing 1 changed file with 7 additions and 18 deletions.
25 changes: 7 additions & 18 deletions net/sctp/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -4083,30 +4083,19 @@ static int sctp_setsockopt_reset_streams(struct sock *sk,
return sctp_send_reset_streams(asoc, params);
}

static int sctp_setsockopt_reset_assoc(struct sock *sk,
char __user *optval,
static int sctp_setsockopt_reset_assoc(struct sock *sk, sctp_assoc_t *associd,
unsigned int optlen)
{
struct sctp_association *asoc;
sctp_assoc_t associd;
int retval = -EINVAL;

if (optlen != sizeof(associd))
goto out;

if (copy_from_user(&associd, optval, optlen)) {
retval = -EFAULT;
goto out;
}
if (optlen != sizeof(*associd))
return -EINVAL;

asoc = sctp_id2assoc(sk, associd);
asoc = sctp_id2assoc(sk, *associd);
if (!asoc)
goto out;

retval = sctp_send_reset_assoc(asoc);
return -EINVAL;

out:
return retval;
return sctp_send_reset_assoc(asoc);
}

static int sctp_setsockopt_add_streams(struct sock *sk,
Expand Down Expand Up @@ -4675,7 +4664,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_reset_streams(sk, kopt, optlen);
break;
case SCTP_RESET_ASSOC:
retval = sctp_setsockopt_reset_assoc(sk, optval, optlen);
retval = sctp_setsockopt_reset_assoc(sk, kopt, optlen);
break;
case SCTP_ADD_STREAMS:
retval = sctp_setsockopt_add_streams(sk, optval, optlen);
Expand Down

0 comments on commit b97d20c

Please sign in to comment.