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

Commit 55e26eb9 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by David S. Miller
Browse files

sctp: Push struct net down to sctp_chunk_event_lookup 



This trickles up through sctp_sm_lookup_event up to sctp_do_sm
and up further into sctp_primitiv_NAME before the code reaches
places where struct net can be reliably found.

Signed-off-by: default avatar"Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebb7e95d

include/net/sctp/sctp.h

+6 −6
Original line number Diff line number Diff line
@@ -139,12 +139,12 @@ extern int sctp_asconf_mgmt(struct sctp_sock *, struct sctp_sockaddr_entry *); 
/*

 * sctp/primitive.c

 */

int sctp_primitive_ASSOCIATE(struct sctp_association *, void *arg);

int sctp_primitive_SHUTDOWN(struct sctp_association *, void *arg);

int sctp_primitive_ABORT(struct sctp_association *, void *arg);

int sctp_primitive_SEND(struct sctp_association *, void *arg);

int sctp_primitive_REQUESTHEARTBEAT(struct sctp_association *, void *arg);

int sctp_primitive_ASCONF(struct sctp_association *, void *arg);

int sctp_primitive_ASSOCIATE(struct net *, struct sctp_association *, void *arg);

int sctp_primitive_SHUTDOWN(struct net *, struct sctp_association *, void *arg);

int sctp_primitive_ABORT(struct net *, struct sctp_association *, void *arg);

int sctp_primitive_SEND(struct net *, struct sctp_association *, void *arg);

int sctp_primitive_REQUESTHEARTBEAT(struct net *, struct sctp_association *, void *arg);

int sctp_primitive_ASCONF(struct net *, struct sctp_association *, void *arg);



/*

 * sctp/input.c

include/net/sctp/sm.h

+3 −2
Original line number Diff line number Diff line
@@ -178,7 +178,8 @@ sctp_state_fn_t sctp_sf_autoclose_timer_expire; 


/* Prototypes for utility support functions.  */

__u8 sctp_get_chunk_type(struct sctp_chunk *chunk);

const sctp_sm_table_entry_t *sctp_sm_lookup_event(sctp_event_t,

const sctp_sm_table_entry_t *sctp_sm_lookup_event(struct net *,

					    sctp_event_t,

					    sctp_state_t,

					    sctp_subtype_t);

int sctp_chunk_iif(const struct sctp_chunk *);
@@ -268,7 +269,7 @@ void sctp_chunk_assign_ssn(struct sctp_chunk *); 


/* Prototypes for statetable processing. */



int sctp_do_sm(sctp_event_t event_type, sctp_subtype_t subtype,

int sctp_do_sm(struct net *net, sctp_event_t event_type, sctp_subtype_t subtype,

	       sctp_state_t state,

               struct sctp_endpoint *,

               struct sctp_association *asoc,

net/sctp/associola.c

+3 −2
Original line number Diff line number Diff line
@@ -1118,6 +1118,7 @@ static void sctp_assoc_bh_rcv(struct work_struct *work) 
	struct sctp_association *asoc =

		container_of(work, struct sctp_association,

			     base.inqueue.immediate);

	struct net *net = sock_net(asoc->base.sk);

	struct sctp_endpoint *ep;

	struct sctp_chunk *chunk;

	struct sctp_inq *inqueue;
@@ -1150,13 +1151,13 @@ static void sctp_assoc_bh_rcv(struct work_struct *work) 
		if (sctp_chunk_is_data(chunk))

			asoc->peer.last_data_from = chunk->transport;

		else

			SCTP_INC_STATS(sock_net(asoc->base.sk), SCTP_MIB_INCTRLCHUNKS);

			SCTP_INC_STATS(net, SCTP_MIB_INCTRLCHUNKS);



		if (chunk->transport)

			chunk->transport->last_time_heard = jiffies;



		/* Run through the state machine. */

		error = sctp_do_sm(SCTP_EVENT_T_CHUNK, subtype,

		error = sctp_do_sm(net, SCTP_EVENT_T_CHUNK, subtype,

				   state, ep, asoc, chunk, GFP_ATOMIC);



		/* Check to see if the association is freed in response to

net/sctp/endpointola.c

+3 −1
Original line number Diff line number Diff line
@@ -413,6 +413,7 @@ static void sctp_endpoint_bh_rcv(struct work_struct *work) 
			     base.inqueue.immediate);

	struct sctp_association *asoc;

	struct sock *sk;

	struct net *net;

	struct sctp_transport *transport;

	struct sctp_chunk *chunk;

	struct sctp_inq *inqueue;
@@ -427,6 +428,7 @@ static void sctp_endpoint_bh_rcv(struct work_struct *work) 
	asoc = NULL;

	inqueue = &ep->base.inqueue;

	sk = ep->base.sk;

	net = sock_net(sk);



	while (NULL != (chunk = sctp_inq_pop(inqueue))) {

		subtype = SCTP_ST_CHUNK(chunk->chunk_hdr->type);
@@ -483,7 +485,7 @@ normal: 
		if (chunk->transport)

			chunk->transport->last_time_heard = jiffies;



		error = sctp_do_sm(SCTP_EVENT_T_CHUNK, subtype, state,

		error = sctp_do_sm(net, SCTP_EVENT_T_CHUNK, subtype, state,

				   ep, asoc, chunk, GFP_ATOMIC);



		if (error && chunk)

net/sctp/input.c

+3 −1
Original line number Diff line number Diff line
@@ -466,11 +466,13 @@ void sctp_icmp_proto_unreachable(struct sock *sk, 
		}

			

	} else {

		struct net *net = sock_net(sk);



		if (timer_pending(&t->proto_unreach_timer) &&

		    del_timer(&t->proto_unreach_timer))

			sctp_association_put(asoc);



		sctp_do_sm(SCTP_EVENT_T_OTHER,

		sctp_do_sm(net, SCTP_EVENT_T_OTHER,

			   SCTP_ST_OTHER(SCTP_EVENT_ICMP_PROTO_UNREACH),

			   asoc->state, asoc->ep, asoc, t,

			   GFP_ATOMIC);