[PATCH net] bonding: fix the program leak when XDP is replaced

[PATCH net] bonding: fix the program leak when XDP is replaced

[Jakub Kicinski]

We need to release the reference on the old BPF prog, whether
we are going to no-prog, or replacing the prog with another.

Spotted by AI while running tests for the propagation series
(leaked programs were accumulating). Selftest will come in
the net-next series to avoid conflicts.

Fixes: 9e2ee5c7e7c3 ("net, bonding: Add XDP support to the bonding driver")
Fixes: 6d5f1ef83868 ("bonding: Fix negative jump label count on nested bonding")
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
---
CC: jv@jvosburgh.net
CC: joamaki@gmail.com
CC: daniel@iogearbox.net
---
 drivers/net/bonding/bond_main.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index de2489c3d9bf..09aa45d71fab 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -5732,12 +5732,12 @@ static int bond_xdp_set(struct net_device *dev, struct bpf_prog *prog,
 			bpf_prog_inc(prog);
 	}
 
-	if (prog) {
+	if (prog && !old_prog)
 		static_branch_inc(&bpf_master_redirect_enabled_key);
-	} else if (old_prog) {
-		bpf_prog_put(old_prog);
+	else if (!prog && old_prog)
 		static_branch_dec(&bpf_master_redirect_enabled_key);
-	}
+	if (old_prog)
+		bpf_prog_put(old_prog);
 
 	return 0;
 
-- 
2.55.0

Re: [PATCH net] bonding: fix the program leak when XDP is replaced

[Daniel Borkmann]

On 10/1/26 3:26 AM, Jakub Kicinski wrote:
> We need to release the reference on the old BPF prog, whether
> we are going to no-prog, or replacing the prog with another.
> 
> Spotted by AI while running tests for the propagation series
> (leaked programs were accumulating). Selftest will come in
> the net-next series to avoid conflicts.
> 
> Fixes: 9e2ee5c7e7c3 ("net, bonding: Add XDP support to the bonding driver")
> Fixes: 6d5f1ef83868 ("bonding: Fix negative jump label count on nested bonding")
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Acked-by: Daniel Borkmann <daniel@iogearbox.net>

Re: [PATCH net] bonding: fix the program leak when XDP is replaced

[Jiayuan Chen]

On 10/1/26 9:26 AM, Jakub Kicinski wrote:
> We need to release the reference on the old BPF prog, whether
> we are going to no-prog, or replacing the prog with another.
>
> Spotted by AI while running tests for the propagation series
> (leaked programs were accumulating). Selftest will come in
> the net-next series to avoid conflicts.
>
> Fixes: 9e2ee5c7e7c3 ("net, bonding: Add XDP support to the bonding driver")
> Fixes: 6d5f1ef83868 ("bonding: Fix negative jump label count on nested bonding")
> Signed-off-by: Jakub Kicinski <kuba@kernel.org>


Reviewed-by: Jiayuan Chen <jiayuan.chen@linux.dev>


> ---
> CC: jv@jvosburgh.net
> CC: joamaki@gmail.com
> CC: daniel@iogearbox.net
> ---
>   drivers/net/bonding/bond_main.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index de2489c3d9bf..09aa45d71fab 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -5732,12 +5732,12 @@ static int bond_xdp_set(struct net_device *dev, struct bpf_prog *prog,
>   			bpf_prog_inc(prog);
>   	}
>   
> -	if (prog) {
> +	if (prog && !old_prog)
>   		static_branch_inc(&bpf_master_redirect_enabled_key);
> -	} else if (old_prog) {
> -		bpf_prog_put(old_prog);
> +	else if (!prog && old_prog)
>   		static_branch_dec(&bpf_master_redirect_enabled_key);
> -	}
> +	if (old_prog)
> +		bpf_prog_put(old_prog);
>   
>   	return 0;
>   

Re: [PATCH net] bonding: fix the program leak when XDP is replaced

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (main)
by Jakub Kicinski <kuba@kernel.org>:

On Wed, 30 Sep 2026 18:26:39 -0700 you wrote:
> We need to release the reference on the old BPF prog, whether
> we are going to no-prog, or replacing the prog with another.
> 
> Spotted by AI while running tests for the propagation series
> (leaked programs were accumulating). Selftest will come in
> the net-next series to avoid conflicts.
> 
> [...]

Here is the summary with links:
  - [net] bonding: fix the program leak when XDP is replaced
    https://git.kernel.org/netdev/net/c/184b5ddf82d4

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html