| Message ID | 20220404150908.2937-1-dsahern@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1158f79f82d437093aeed87d57df0548bdd68146 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] ipv6: Fix stats accounting in ip6_pkt_drop | expand |
Hello: This patch was applied to netdev/net.git (master) by Paolo Abeni <pabeni@redhat.com>: On Mon, 4 Apr 2022 09:09:08 -0600 you wrote: > 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> > > [...] Here is the summary with links: - [net] ipv6: Fix stats accounting in ip6_pkt_drop https://git.kernel.org/netdev/net/c/1158f79f82d4 You are awesome, thank you!
diff --git a/net/ipv6/route.c b/net/ipv6/route.c index 2fa10e60cccd..169e9df6d172 100644 --- a/net/ipv6/route.c +++ b/net/ipv6/route.c @@ -4484,7 +4484,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
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> --- net/ipv6/route.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)