Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a5e2da6e authored by Daniel Borkmann's avatar Daniel Borkmann Committed by David S. Miller
Browse files

bpf: netdev is never null in __dev_map_flush 



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: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Acked-by: default avatarJohn Fastabend <john.fastabend@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d2aaa3dc

kernel/bpf/devmap.c

+3 −5
Original line number Diff line number Diff line
@@ -226,11 +226,9 @@ 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 = dev->dev;

		if (likely(netdev->netdev_ops->ndo_xdp_flush))

			netdev->netdev_ops->ndo_xdp_flush(netdev);

	}

}