aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv4/esp4_offload.c
diff options
context:
space:
mode:
authorUlrich Weber <ulrich.weber@gmail.com>2020-01-15 12:11:29 +0100
committerSteffen Klassert <steffen.klassert@secunet.com>2020-01-15 12:18:35 +0100
commit4e4362d2bf2a49ff44dbbc9585207977ca3d71d0 (patch)
treeb0fc99a567037a96167addf47fda1e8f585576c9 /net/ipv4/esp4_offload.c
parentxfrm: interface: do not confirm neighbor when do pmtu update (diff)
downloadlinux-dev-4e4362d2bf2a49ff44dbbc9585207977ca3d71d0.tar.xz
linux-dev-4e4362d2bf2a49ff44dbbc9585207977ca3d71d0.zip
xfrm: support output_mark for offload ESP packets
Commit 9b42c1f179a6 ("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: 9b42c1f179a6 ("xfrm: Extend the output_mark to support input direction and masking.") Signed-off-by: Ulrich Weber <ulrich.weber@gmail.com> Signed-off-by: Steffen Klassert <steffen.klassert@secunet.com>
Diffstat (limited to 'net/ipv4/esp4_offload.c')
-rw-r--r--net/ipv4/esp4_offload.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/esp4_offload.c b/net/ipv4/esp4_offload.c
index 0e4a7cf6bc87..e2e219c7854a 100644
--- a/net/ipv4/esp4_offload.c
+++ b/net/ipv4/esp4_offload.c
@@ -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++;