Commit 9a3fb9fb authored Mar 19, 2018 by Steffen Klassert

xfrm: Fix transport mode skb control buffer usage.



A recent commit introduced a new struct xfrm_trans_cb
that is used with the sk_buff control buffer. Unfortunately
it placed the structure in front of the control buffer and
overlooked that the IPv4/IPv6 control buffer is still needed
for some layer 4 protocols. As a result the IPv4/IPv6 control
buffer is overwritten with this structure. Fix this by setting
a apropriate header in front of the structure.

Fixes acf568ee ("xfrm: Reinject transport-mode packets ...")
Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>

parent f8a554b4

net/xfrm/xfrm_input.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,12 @@ struct xfrm_trans_tasklet {
		};

		struct xfrm_trans_cb {
		union {
		struct inet_skb_parm h4;
		#if IS_ENABLED(CONFIG_IPV6)
		struct inet6_skb_parm h6;
		#endif
		} header;
		int (finish)(struct net net, struct sock sk, struct sk_buff skb);
		};