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

Commit b2e06191 authored by Ulrich Weber's avatar Ulrich Weber Committed by Greg Kroah-Hartman
Browse files

xfrm: support output_mark for offload ESP packets 



commit 4e4362d2bf2a49ff44dbbc9585207977ca3d71d0 upstream.

Commit 9b42c1f1 ("xfrm: Extend the output_mark") added output_mark
support but missed ESP offload support.

xfrm_smark_get() is not called within xfrm_input() for packets coming
from esp4_gro_receive() or esp6_gro_receive(). Therefore call
xfrm_smark_get() directly within these functions.

Fixes: 9b42c1f1 ("xfrm: Extend the output_mark to support input direction and masking.")
Signed-off-by: default avatarUlrich Weber <ulrich.weber@gmail.com>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4e1572b1

net/ipv4/esp4_offload.c

+2 −0
Original line number Diff line number Diff line
@@ -57,6 +57,8 @@ static struct sk_buff *esp4_gro_receive(struct list_head *head, 
		if (!x)

			goto out_reset;



		skb->mark = xfrm_smark_get(skb->mark, x);



		sp->xvec[sp->len++] = x;

		sp->olen++;

net/ipv6/esp6_offload.c

+2 −0
Original line number Diff line number Diff line
@@ -79,6 +79,8 @@ static struct sk_buff *esp6_gro_receive(struct list_head *head, 
		if (!x)

			goto out_reset;



		skb->mark = xfrm_smark_get(skb->mark, x);



		sp->xvec[sp->len++] = x;

		sp->olen++;