path: root/net/xfrm/xfrm_input.c
diff options
authorSteffen Klassert <steffen.klassert@secunet.com>2018-03-19 07:15:39 +0100
committerSteffen Klassert <steffen.klassert@secunet.com>2018-03-23 07:56:04 +0100
commit9a3fb9fb84cc30577c1b012a6a3efda944684291 (patch)
treec1e43f1ba834f115535c27fe4479288caf979989 /net/xfrm/xfrm_input.c
parentvti6: Fix dev->max_mtu setting (diff)
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 acf568ee859f ("xfrm: Reinject transport-mode packets ...") Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/xfrm/xfrm_input.c')
1 files changed, 6 insertions, 0 deletions
diff --git a/net/xfrm/xfrm_input.c b/net/xfrm/xfrm_input.c
index 1472c0857975..81788105c164 100644
--- a/net/xfrm/xfrm_input.c
+++ b/net/xfrm/xfrm_input.c
@@ -26,6 +26,12 @@ struct xfrm_trans_tasklet {
struct xfrm_trans_cb {
+ union {
+ struct inet_skb_parm h4;
+ struct inet6_skb_parm h6;
+ } header;
int (*finish)(struct net *net, struct sock *sk, struct sk_buff *skb);