xdp: Reset prog in dev_change_xdp_fd when fd is negative
Subsystems (2)
PATCH 1/1 xdp: Reset prog in dev_change_xdp_fd when fd is negative
From: David Ahern <[email protected]>
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.
--- net/core/dev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/core/dev.c +2 -1
@@ -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);
Signature · 1 line
2.20.1
Quoted 11 lines · On Sun, 12 Apr 2020 07:32:04 -0600 David Ahern wrote:
From: David Ahern <[email protected]>
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 theexpected_fdset to actually calldev_xdp_installfor 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 <[email protected]>Cc Toke Høiland-Jørgensen <[email protected]>
Quoted 11 lines · David Ahern
From: David Ahern <[email protected]>
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 theexpected_fdset to actually calldev_xdp_installfor 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 <[email protected]>Cc Toke Høiland-Jørgensen <[email protected]>
Argh. Thanks for the fix.
Toke, please review.
Quoted 11 lines · David Ahern
From: David Ahern <[email protected]>
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 theexpected_fdset to actually calldev_xdp_installfor 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 <[email protected]>Cc Toke Høiland-Jørgensen <[email protected]>
Ugh, my bad (obviously!). Thanks for the fix! I'll send an update to the selftest to catch errors like this...
Daniel Borkmann
AppliedQuoted 10 lines · Toke Høiland-Jørgensen
Quoted 8 lines · David Ahern
From: David Ahern <[email protected]>
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 theexpected_fdset to actually calldev_xdp_installfor the existing program. The end result is that the detach does not happen.
Quoted 6 lines
Quoted 3 lines
Fixes 92234c8f15c8 ("xdp: Support specifying expected existing program when attaching XDP")Signed-off-by David Ahern <[email protected]>Cc Toke Høiland-Jørgensen <[email protected]>Ugh, my bad (obviously!). Thanks for the fix! I'll send an update to the selftest to catch errors like this...
+1
Quoted 1 line
Reviewed-by Toke Høiland-Jørgensen <[email protected]>
Applied, thanks!