Commit 6d5f1ef8 authored by Jussi Maki's avatar Jussi Maki Committed by David S. Miller

bonding: Fix negative jump label count on nested bonding

With nested bonding devices the nested bond device's ndo_bpf was
called without a program causing it to decrement the static key
without a prior increment leading to negative count.

Fix the issue by 1) only calling slave's ndo_bpf when there's a
program to be loaded and 2) only decrement the count when a program
is unloaded.

Fixes: 9e2ee5c7 ("net, bonding: Add XDP support to the bonding driver")
Reported-by: syzbot+30622fb04ddd72a4d167@syzkaller.appspotmail.com
Signed-off-by: default avatarJussi Maki <joamaki@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e0b6417b
...@@ -2169,7 +2169,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev, ...@@ -2169,7 +2169,7 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
res = -EOPNOTSUPP; res = -EOPNOTSUPP;
goto err_sysfs_del; goto err_sysfs_del;
} }
} else { } else if (bond->xdp_prog) {
struct netdev_bpf xdp = { struct netdev_bpf xdp = {
.command = XDP_SETUP_PROG, .command = XDP_SETUP_PROG,
.flags = 0, .flags = 0,
...@@ -5224,13 +5224,12 @@ static int bond_xdp_set(struct net_device *dev, struct bpf_prog *prog, ...@@ -5224,13 +5224,12 @@ static int bond_xdp_set(struct net_device *dev, struct bpf_prog *prog,
bpf_prog_inc(prog); bpf_prog_inc(prog);
} }
if (old_prog) if (prog) {
bpf_prog_put(old_prog);
if (prog)
static_branch_inc(&bpf_master_redirect_enabled_key); static_branch_inc(&bpf_master_redirect_enabled_key);
else } else if (old_prog) {
bpf_prog_put(old_prog);
static_branch_dec(&bpf_master_redirect_enabled_key); static_branch_dec(&bpf_master_redirect_enabled_key);
}
return 0; return 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment