Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb195605 authored by Xin Long's avatar Xin Long Committed by David S. Miller
Browse files

sctp: use SCTP_FUTURE_ASSOC for SCTP_PR_SUPPORTED sockopt 



Check with SCTP_FUTURE_ASSOC instead in
sctp_set/getsockopt_pr_supported, it's compatible with 0.

It also adjusts some code to keep a same check form as other functions.

Signed-off-by: default avatarXin Long <lucien.xin@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8add543e

net/sctp/socket.c

+11 −7
Original line number Diff line number Diff line
@@ -3965,6 +3965,7 @@ static int sctp_setsockopt_pr_supported(struct sock *sk, 
					unsigned int optlen)

{

	struct sctp_assoc_value params;

	struct sctp_association *asoc;



	if (optlen != sizeof(params))

		return -EINVAL;
@@ -3972,6 +3973,11 @@ static int sctp_setsockopt_pr_supported(struct sock *sk, 
	if (copy_from_user(&params, optval, optlen))

		return -EFAULT;



	asoc = sctp_id2assoc(sk, params.assoc_id);

	if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&

	    sctp_style(sk, UDP))

		return -EINVAL;



	sctp_sk(sk)->ep->prsctp_enable = !!params.assoc_value;



	return 0;
@@ -7084,17 +7090,15 @@ static int sctp_getsockopt_pr_supported(struct sock *sk, int len, 
		goto out;



	asoc = sctp_id2assoc(sk, params.assoc_id);

	if (asoc) {

		params.assoc_value = asoc->prsctp_enable;

	} else if (!params.assoc_id) {

		struct sctp_sock *sp = sctp_sk(sk);



		params.assoc_value = sp->ep->prsctp_enable;

	} else {

	if (!asoc && params.assoc_id != SCTP_FUTURE_ASSOC &&

	    sctp_style(sk, UDP)) {

		retval = -EINVAL;

		goto out;

	}



	params.assoc_value = asoc ? asoc->prsctp_enable

				  : sctp_sk(sk)->ep->prsctp_enable;



	if (put_user(len, optlen))

		goto out;