diff options
| author | David Ahern <dsahern@gmail.com> | 2020-04-12 07:32:04 -0600 |
|---|---|---|
| committer | Daniel Borkmann <daniel@iogearbox.net> | 2020-04-14 21:38:02 +0200 |
| commit | dfa74909cb6b846cbdabfc2c3c7de1d507fca075 (patch) | |
| tree | abcec0eda77f457704330ae51338d22e98d656c9 /net | |
| parent | 96b2eb6e77959b4b52f80e7a61d03db77606aac6 (diff) | |
| download | linux-dfa74909cb6b846cbdabfc2c3c7de1d507fca075.tar.gz linux-dfa74909cb6b846cbdabfc2c3c7de1d507fca075.tar.bz2 linux-dfa74909cb6b846cbdabfc2c3c7de1d507fca075.zip | |
xdp: Reset prog in dev_change_xdp_fd when fd is negative
The commit mentioned in the Fixes tag reuses the local prog variable
when looking up an expected_fd. The variable is not reset when fd < 0
causing a detach with the expected_fd set to actually call
dev_xdp_install for the existing program. The end result is that the
detach does not happen.
Fixes: 92234c8f15c8 ("xdp: Support specifying expected existing program when attaching XDP")
Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Reviewed-by: Toke Høiland-Jørgensen <toke@redhat.com>
Link: https://lore.kernel.org/bpf/20200412133204.43847-1-dsahern@kernel.org
Diffstat (limited to 'net')
| -rw-r--r-- | net/core/dev.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index df8097b8e286..522288177bbd 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -8667,8 +8667,8 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, const struct net_device_ops *ops = dev->netdev_ops; enum bpf_netdev_command query; u32 prog_id, expected_id = 0; - struct bpf_prog *prog = NULL; bpf_op_t bpf_op, bpf_chk; + struct bpf_prog *prog; bool offload; int err; @@ -8734,6 +8734,7 @@ int dev_change_xdp_fd(struct net_device *dev, struct netlink_ext_ack *extack, } else { if (!prog_id) return 0; + prog = NULL; } err = dev_xdp_install(dev, bpf_op, extack, flags, prog); |