Commit 8688ab21 authored by Mike Yu's avatar Mike Yu Committed by Steffen Klassert
Browse files

xfrm: set skb control buffer based on packet offload as well 



In packet offload, packets are not encrypted in XFRM stack, so
the next network layer which the packets will be forwarded to
should depend on where the packet came from (either xfrm4_output
or xfrm6_output) rather than the matched SA's family type.

Test: verified IPv6-in-IPv4 packets on Android device with
      IPsec packet offload enabled
Signed-off-by: default avatarMike Yu <yumike@google.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent d4872d70

net/xfrm/xfrm_output.c

+5 −1
Original line number Diff line number Diff line
@@ -704,9 +704,13 @@ int xfrm_output(struct sock *sk, struct sk_buff *skb) 
{

	struct net *net = dev_net(skb_dst(skb)->dev);

	struct xfrm_state *x = skb_dst(skb)->xfrm;

	int family;

	int err;



	switch (x->outer_mode.family) {

	family = (x->xso.type != XFRM_DEV_OFFLOAD_PACKET) ? x->outer_mode.family

		: skb_dst(skb)->ops->family;



	switch (family) {

	case AF_INET:

		memset(IPCB(skb), 0, sizeof(*IPCB(skb)));

		IPCB(skb)->flags |= IPSKB_XFRM_TRANSFORMED;