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

Commit c74bfbdb authored by Willem de Bruijn's avatar Willem de Bruijn Committed by David S. Miller
Browse files

sctp: load transport header after sk_filter 



Do not cache pointers into the skb linear segment across sk_filter.
The function call can trigger pskb_expand_head.

Signed-off-by: default avatarWillem de Bruijn <willemb@google.com>
Acked-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0564bf0a

net/sctp/input.c

+1 −4
Original line number Diff line number Diff line
@@ -112,7 +112,6 @@ int sctp_rcv(struct sk_buff *skb) 
	struct sctp_ep_common *rcvr;

	struct sctp_transport *transport = NULL;

	struct sctp_chunk *chunk;

	struct sctphdr *sh;

	union sctp_addr src;

	union sctp_addr dest;

	int family;
@@ -127,8 +126,6 @@ int sctp_rcv(struct sk_buff *skb) 
	if (skb_linearize(skb))

		goto discard_it;



	sh = sctp_hdr(skb);



	/* Pull up the IP and SCTP headers. */

	__skb_pull(skb, skb_transport_offset(skb));

	if (skb->len < sizeof(struct sctphdr))
@@ -230,7 +227,7 @@ int sctp_rcv(struct sk_buff *skb) 
	chunk->rcvr = rcvr;



	/* Remember the SCTP header. */

	chunk->sctp_hdr = sh;

	chunk->sctp_hdr = sctp_hdr(skb);



	/* Set the source and destination addresses of the incoming chunk.  */

	sctp_init_addrs(chunk, &src, &dest);