sctp: Correct access to skb->{network, transport}_header (158874ca) · Commits · 戴 / test

This corrects an regression introduced by "net: Use 16bits for *_headers fields of struct skbuff" when NET_SKBUFF_DATA_USES_OFFSET is not set. In that case sk_buff_data_t will be a pointer, however, skb->{network,transport}_header is now __u16. Signed-off-by:

Simon Horman <horms@verge.net.au> Signed-off-by:

David S. Miller <davem@davemloft.net>

net/sctp/input.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -589,7 +589,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info)
		struct sctp_association *asoc = NULL;
		struct sctp_transport *transport;
		struct inet_sock *inet;
		sk_buff_data_t saveip, savesctp;
		__be16 saveip, savesctp;
		int err;
		struct net *net = dev_net(skb->dev);

net/sctp/ipv6.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ SCTP_STATIC void sctp_v6_err(struct sk_buff skb, struct inet6_skb_parm opt,
		struct sctp_association *asoc;
		struct sctp_transport *transport;
		struct ipv6_pinfo *np;
		sk_buff_data_t saveip, savesctp;
		__be16 saveip, savesctp;
		int err;
		struct net *net = dev_net(skb->dev);

Admin message