Netdev List
 help / color / mirror / Atom feed
* [PATCH] bonding: unbind 802.3ad slaves on enslave failure
@ 2026-11-13 13:04 Lin Jiapeng
  2026-11-16  7:34 ` Hangbin Liu
  0 siblings, 1 reply; 2+ messages in thread
From: Lin Jiapeng @ 2026-11-13 13:04 UTC (permalink / raw)
  To: jv, andrew+netdev, davem, edumazet, kuba, pabeni, sfeldma, netdev,
	linux-kernel
  Cc: Lin Jiapeng, TencentOS Corvus AI

From: Lin Jiapeng <jiapenglin@tencent.com>

The 802.3ad enslave path binds a slave to an aggregator before publishing
it in the bond's slave list. This lets the periodic state machine select
the port and attach it to a LAG while enslavement is in progress.

If a later step fails, the rollback removes the slave and frees its
ad_slave_info without unbinding its port. A port selected in the meantime
can remain linked from another live slave's aggregator, so later LAG
processing accesses freed memory. A test-only kretprobe forces
bond_sysfs_slave_add() to return -ENOMEM, after which KASAN reports:
     BUG: KASAN: slab-use-after-free in ad_agg_selection_logic+0x1a0d/0x1fa0
     Read of size 1 at addr ff11000109be946e by task kworker/u16:0/13
     Freed by task 110:
       kasan_save_stack+0x30/0x50
       kasan_save_track+0x14/0x30
       kasan_save_free_info+0x3b/0x70
       __kasan_slab_free+0x47/0x70
       kfree+0x1b3/0x550
       slave_kobj_release+0xb6/0xd0
       kobject_put+0x17e/0x300
       bond_enslave+0x1acc/0x5090

Call bond_3ad_unbind_slave() in the common rollback for published slaves
before unlinking the slave from the bond. This detaches the port under
mode_lock and preserves the invalidate-drain-free ordering used by normal
release. Successful enslavement and earlier unpublished failures are
unchanged.

Fixes: 07699f9a7c8d ("bonding: add sysfs /slave dir for bond slave devices.")
Reported-by: TencentOS Corvus AI <corvus@tencent.com>
Signed-off-by: Lin Jiapeng <jiapenglin@tencent.com>
---
 drivers/net/bonding/bond_main.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
index e9f5e753f677..60cc9a6a4fc7 100644
--- a/drivers/net/bonding/bond_main.c
+++ b/drivers/net/bonding/bond_main.c
@@ -2355,6 +2355,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
 	bond_sysfs_slave_del(new_slave);
 
 err_upper_unlink:
+	if (BOND_MODE(bond) == BOND_MODE_8023AD)
+		bond_3ad_unbind_slave(new_slave);
 	bond_upper_dev_unlink(bond, new_slave);
 
 err_unregister:
-- 
2.55.0


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] bonding: unbind 802.3ad slaves on enslave failure
  2026-11-13 13:04 [PATCH] bonding: unbind 802.3ad slaves on enslave failure Lin Jiapeng
@ 2026-11-16  7:34 ` Hangbin Liu
  0 siblings, 0 replies; 2+ messages in thread
From: Hangbin Liu @ 2026-11-16  7:34 UTC (permalink / raw)
  To: Lin Jiapeng
  Cc: jv, andrew+netdev, davem, edumazet, kuba, pabeni, sfeldma, netdev,
	linux-kernel, Lin Jiapeng, TencentOS Corvus AI

Hi Jiapeng,
On Fri, Nov 13, 2026 at 09:04:40PM +0800, Lin Jiapeng wrote:
> From: Lin Jiapeng <jiapenglin@tencent.com>
> 
> The 802.3ad enslave path binds a slave to an aggregator before publishing
> it in the bond's slave list. This lets the periodic state machine select
> the port and attach it to a LAG while enslavement is in progress.
> 
> If a later step fails, the rollback removes the slave and frees its
> ad_slave_info without unbinding its port. A port selected in the meantime
> can remain linked from another live slave's aggregator, so later LAG
> processing accesses freed memory. A test-only kretprobe forces
> bond_sysfs_slave_add() to return -ENOMEM, after which KASAN reports:
>      BUG: KASAN: slab-use-after-free in ad_agg_selection_logic+0x1a0d/0x1fa0
>      Read of size 1 at addr ff11000109be946e by task kworker/u16:0/13
>      Freed by task 110:
>        kasan_save_stack+0x30/0x50
>        kasan_save_track+0x14/0x30
>        kasan_save_free_info+0x3b/0x70
>        __kasan_slab_free+0x47/0x70
>        kfree+0x1b3/0x550
>        slave_kobj_release+0xb6/0xd0
>        kobject_put+0x17e/0x300
>        bond_enslave+0x1acc/0x5090
> 
> Call bond_3ad_unbind_slave() in the common rollback for published slaves
> before unlinking the slave from the bond. This detaches the port under
> mode_lock and preserves the invalidate-drain-free ordering used by normal
> release. Successful enslavement and earlier unpublished failures are
> unchanged.
> 
> Fixes: 07699f9a7c8d ("bonding: add sysfs /slave dir for bond slave devices.")
> Reported-by: TencentOS Corvus AI <corvus@tencent.com>
> Signed-off-by: Lin Jiapeng <jiapenglin@tencent.com>
> ---
>  drivers/net/bonding/bond_main.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c
> index e9f5e753f677..60cc9a6a4fc7 100644
> --- a/drivers/net/bonding/bond_main.c
> +++ b/drivers/net/bonding/bond_main.c
> @@ -2355,6 +2355,8 @@ int bond_enslave(struct net_device *bond_dev, struct net_device *slave_dev,
>  	bond_sysfs_slave_del(new_slave);
>  
>  err_upper_unlink:
> +	if (BOND_MODE(bond) == BOND_MODE_8023AD)
> +		bond_3ad_unbind_slave(new_slave);
>  	bond_upper_dev_unlink(bond, new_slave);
>  
>  err_unregister:
> -- 
> 2.55.0
> 

Thanks for your fix. I’m also working on correcting some error rollback issues
in `bond_enslave`, including the 3ad unbind problem. My patch still needs
further adjustments[1].

Just FYI, I’ll leave it up to the maintainer to decide whether to apply
your fix first.

[1] https://lore.kernel.org/all/20261113-bond_enslave_restruct-v1-0-364c549e78db@kylinos.cn/

Thanks
Hangbin

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2026-11-16  7:35 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-11-13 13:04 [PATCH] bonding: unbind 802.3ad slaves on enslave failure Lin Jiapeng
2026-11-16  7:34 ` Hangbin Liu

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox