This is a note to let you know that I've just added the patch titled
xfrm: fix dflt policy check when there is no policy configured
to the 5.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
xfrm-fix-dflt-policy-check-when-there-is-no-policy-c.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
commit f0ea470080f9e2e0d450b29ea9642cd4eb4295e5
Author: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
Date: Mon Nov 22 11:33:13 2021 +0100
xfrm: fix dflt policy check when there is no policy configured
[ Upstream commit ec3bb890817e4398f2d46e12e2e205495b116be9 ]
When there is no policy configured on the system, the default policy is
checked in xfrm_route_forward. However, it was done with the wrong
direction (XFRM_POLICY_FWD instead of XFRM_POLICY_OUT).
The default policy for XFRM_POLICY_FWD was checked just before, with a call
to xfrm[46]_policy_check().
CC: stable@xxxxxxxxxxxxxxx
Fixes: 2d151d39073a ("xfrm: Add possibility to set the default to block if we have no policy")
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@xxxxxxxxx>
Signed-off-by: Steffen Klassert <steffen.klassert@xxxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index 988886f95e5b..6a9e3b4c8a35 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -1175,7 +1175,7 @@ static inline int xfrm_route_forward(struct sk_buff *skb, unsigned short family)
{
struct net *net = dev_net(skb->dev);
- if (xfrm_default_allow(net, XFRM_POLICY_FWD))
+ if (xfrm_default_allow(net, XFRM_POLICY_OUT))
return !net->xfrm.policy_count[XFRM_POLICY_OUT] ||
(skb_dst(skb)->flags & DST_NOXFRM) ||
__xfrm_route_forward(skb, family);
