Skip to content

Commit

Permalink
sctp: pass a kernel pointer to sctp_setsockopt_pf_expose
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 92c4f17 commit 26feba8
Showing 1 changed file with 8 additions and 14 deletions.
22 changes: 8 additions & 14 deletions net/sctp/socket.c
Original file line number Diff line number Diff line change
Expand Up @@ -4382,33 +4382,27 @@ static int sctp_setsockopt_ecn_supported(struct sock *sk,
}

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

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

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

if (params.assoc_value > SCTP_PF_EXPOSE_MAX)
if (params->assoc_value > SCTP_PF_EXPOSE_MAX)
goto out;

asoc = sctp_id2assoc(sk, params.assoc_id);
if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&
asoc = sctp_id2assoc(sk, params->assoc_id);
if (!asoc && params->assoc_id != SCTP_FUTURE_ASSOC &&
sctp_style(sk, UDP))
goto out;

if (asoc)
asoc->pf_expose = params.assoc_value;
asoc->pf_expose = params->assoc_value;
else
sctp_sk(sk)->pf_expose = params.assoc_value;
sctp_sk(sk)->pf_expose = params->assoc_value;
retval = 0;

out:
Expand Down Expand Up @@ -4632,7 +4626,7 @@ static int sctp_setsockopt(struct sock *sk, int level, int optname,
retval = sctp_setsockopt_ecn_supported(sk, kopt, optlen);
break;
case SCTP_EXPOSE_POTENTIALLY_FAILED_STATE:
retval = sctp_setsockopt_pf_expose(sk, optval, optlen);
retval = sctp_setsockopt_pf_expose(sk, kopt, optlen);
break;
default:
retval = -ENOPROTOOPT;
Expand Down

0 comments on commit 26feba8

Please sign in to comment.