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

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

sctp: use SCTP_FUTURE_ASSOC and add SCTP_CURRENT_ASSOC for SCTP_CONTEXT sockopt 



Check with SCTP_ALL_ASSOC instead in sctp_setsockopt_context and
check with SCTP_FUTURE_ASSOC instead in sctp_getsockopt_context,
it's compatible with 0.

SCTP_CURRENT_ASSOC is supported for SCTP_CONTEXT in this patch.
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 92fc3bd9

net/sctp/socket.c

+23 −18
Original line number Diff line number Diff line
@@ -3510,8 +3510,8 @@ static int sctp_setsockopt_adaptation_layer(struct sock *sk, char __user *optval 
static int sctp_setsockopt_context(struct sock *sk, char __user *optval,

				   unsigned int optlen)

{

	struct sctp_sock *sp = sctp_sk(sk);

	struct sctp_assoc_value params;

	struct sctp_sock *sp;

	struct sctp_association *asoc;



	if (optlen != sizeof(struct sctp_assoc_value))
@@ -3519,17 +3519,26 @@ static int sctp_setsockopt_context(struct sock *sk, char __user *optval, 
	if (copy_from_user(&params, optval, optlen))

		return -EFAULT;



	sp = sctp_sk(sk);



	if (params.assoc_id != 0) {

	asoc = sctp_id2assoc(sk, params.assoc_id);

		if (!asoc)

	if (!asoc && params.assoc_id > SCTP_ALL_ASSOC &&

	    sctp_style(sk, UDP))

		return -EINVAL;



	if (asoc) {

		asoc->default_rcv_context = params.assoc_value;

	} else {

		sp->default_rcv_context = params.assoc_value;



		return 0;

	}



	if (params.assoc_id == SCTP_FUTURE_ASSOC ||

	    params.assoc_id == SCTP_ALL_ASSOC)

		sp->default_rcv_context = params.assoc_value;



	if (params.assoc_id == SCTP_CURRENT_ASSOC ||

	    params.assoc_id == SCTP_ALL_ASSOC)

		list_for_each_entry(asoc, &sp->ep->asocs, asocs)

			asoc->default_rcv_context = params.assoc_value;



	return 0;

}
@@ -6517,7 +6526,6 @@ static int sctp_getsockopt_context(struct sock *sk, int len, 
				   char __user *optval, int __user *optlen)

{

	struct sctp_assoc_value params;

	struct sctp_sock *sp;

	struct sctp_association *asoc;



	if (len < sizeof(struct sctp_assoc_value))
@@ -6528,16 +6536,13 @@ static int sctp_getsockopt_context(struct sock *sk, int len, 
	if (copy_from_user(&params, optval, len))

		return -EFAULT;



	sp = sctp_sk(sk);



	if (params.assoc_id != 0) {

	asoc = sctp_id2assoc(sk, params.assoc_id);

		if (!asoc)

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

	    sctp_style(sk, UDP))

		return -EINVAL;

		params.assoc_value = asoc->default_rcv_context;

	} else {

		params.assoc_value = sp->default_rcv_context;

	}



	params.assoc_value = asoc ? asoc->default_rcv_context

				  : sctp_sk(sk)->default_rcv_context;



	if (put_user(len, optlen))

		return -EFAULT;