diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2022-04-15 09:26:00 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2022-04-15 09:26:00 +0200 |
| commit | edf45f007a31e86738f6be3065591ddad94477d1 (patch) | |
| tree | 2805eeead7a03344a2b1185314d791a65fe15dc1 /net/ipv6/ip6_output.c | |
| parent | Merge branch 'rndis_host-handle-bogus-mac-addresses-in-zte-rndis-devices' (diff) | |
| parent | Merge tag 'net-5.18-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/net... (diff) | |
| download | linux-edf45f007a31e86738f6be3065591ddad94477d1.tar.xz linux-edf45f007a31e86738f6be3065591ddad94477d1.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Diffstat (limited to 'net/ipv6/ip6_output.c')
| -rw-r--r-- | net/ipv6/ip6_output.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/ip6_output.c b/net/ipv6/ip6_output.c index 3e729cee6486..1f3d777e7694 100644 --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6_output.c @@ -486,7 +486,7 @@ int ip6_forward(struct sk_buff *skb) goto drop; if (!net->ipv6.devconf_all->disable_policy && - !idev->cnf.disable_policy && + (!idev || !idev->cnf.disable_policy) && !xfrm6_policy_check(NULL, XFRM_POLICY_FWD, skb)) { __IP6_INC_STATS(net, idev, IPSTATS_MIB_INDISCARDS); goto drop; |