| From 698558edf3f2c0bdc06fd6326cd0ac2964fc8c17 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 4 Apr 2022 09:09:08 -0600 |
| Subject: ipv6: Fix stats accounting in ip6_pkt_drop |
| |
| From: David Ahern <dsahern@kernel.org> |
| |
| [ Upstream commit 1158f79f82d437093aeed87d57df0548bdd68146 ] |
| |
| VRF devices are the loopbacks for VRFs, and a loopback can not be |
| assigned to a VRF. Accordingly, the condition in ip6_pkt_drop should |
| be '||' not '&&'. |
| |
| Fixes: 1d3fd8a10bed ("vrf: Use orig netdev to count Ip6InNoRoutes and a fresh route lookup when sending dest unreach") |
| Reported-by: Pudak, Filip <Filip.Pudak@windriver.com> |
| Reported-by: Xiao, Jiguang <Jiguang.Xiao@windriver.com> |
| Signed-off-by: David Ahern <dsahern@kernel.org> |
| Link: https://lore.kernel.org/r/20220404150908.2937-1-dsahern@kernel.org |
| Signed-off-by: Paolo Abeni <pabeni@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| net/ipv6/route.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/net/ipv6/route.c b/net/ipv6/route.c |
| index 75f916b7460c..cac0d65ed124 100644 |
| --- a/net/ipv6/route.c |
| +++ b/net/ipv6/route.c |
| @@ -4509,7 +4509,7 @@ static int ip6_pkt_drop(struct sk_buff *skb, u8 code, int ipstats_mib_noroutes) |
| struct inet6_dev *idev; |
| int type; |
| |
| - if (netif_is_l3_master(skb->dev) && |
| + if (netif_is_l3_master(skb->dev) || |
| dst->dev == net->loopback_dev) |
| idev = __in6_dev_get_safely(dev_get_by_index_rcu(net, IP6CB(skb)->iif)); |
| else |
| -- |
| 2.35.1 |
| |
