From: Daniel Borkmann <daniel@iogearbox.net>
Date: Thu, 24 Aug 2017 03:20:11 +0200
Subject: bpf: netdev is never null in __dev_map_flush
Patch-mainline: v4.14-rc1
Git-commit: a5e2da6e9787187ff104c34aa048419703c1f9cb
References: bsc#1109837
No need to test for it in fast-path, every dev in bpf_dtab_netdev
is guaranteed to be non-NULL, otherwise dev_map_update_elem() will
fail in the first place.
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Acked-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
---
kernel/bpf/devmap.c | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
--- a/kernel/bpf/devmap.c
+++ b/kernel/bpf/devmap.c
@@ -226,12 +226,10 @@ void __dev_map_flush(struct bpf_map *map
if (unlikely(!dev))
continue;
- netdev = dev->dev;
__clear_bit(bit, bitmap);
- if (unlikely(!netdev || !netdev->netdev_ops->ndo_xdp_flush))
- continue;
-
- netdev->netdev_ops->ndo_xdp_flush(netdev);
+ netdev = dev->dev;
+ if (likely(netdev->netdev_ops->ndo_xdp_flush))
+ netdev->netdev_ops->ndo_xdp_flush(netdev);
}
}