hsr: fix a race condition in node list insertion and deletion
Subsystems (3)
PATCH 5/6 hsr: fix a race condition in node list insertion and deletion
hsr nodes are protected by RCU and there is no write side lock. But node insertions and deletions could be being operated concurrently. So write side locking is needed.
Test commands:
ip netns add nst
ip link add veth0 type veth peer name veth1
ip link add veth2 type veth peer name veth3
ip link set veth1 netns nst
ip link set veth3 netns nst
ip link set veth0 up
ip link set veth2 up
ip link add hsr0 type hsr slave1 veth0 slave2 veth2
ip a a 192.168.100.1/24 dev hsr0
ip link set hsr0 up
ip netns exec nst ip link set veth1 up
ip netns exec nst ip link set veth3 up
ip netns exec nst ip link add hsr1 type hsr slave1 veth1 slave2 veth3 ip netns exec nst ip a a 192.168.100.2/24 dev hsr1
ip netns exec nst ip link set hsr1 up
for i in {0..9}
do
for j in {0..9}
do
for k in {0..9}
do
for l in {0..9}
do
arping 192.168.100.2 -I hsr0 -s 00:01:3$i:4$j:5$k:6$l -c1 & done
done
done
done
Splat looks like:
[ 236.066091][ T3286] list_add corruption. next->prev should be prev (ffff8880a5940300), but was ffff8880a5940d0. [ 236.069617][ T3286] ------------[ cut here ]------------ [ 236.070545][ T3286] kernel BUG at lib/list_debug.c:25! [ 236.071391][ T3286] invalid opcode: 0000 [#1] SMP DEBUG_PAGEALLOC KASAN PTI [ 236.072343][ T3286] CPU: 0 PID: 3286 Comm: arping Tainted: G W 5.5.0-rc1+ #209 [ 236.073463][ T3286] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 [ 236.074695][ T3286] RIP: 0010:__list_add_valid+0x74/0xd0 [ 236.075499][ T3286] Code: 48 39 da 75 27 48 39 f5 74 36 48 39 dd 74 31 48 83 c4 08 b8 01 00 00 00 5b 5d c3 48 b [ 236.078277][ T3286] RSP: 0018:ffff8880aaa97648 EFLAGS: 00010286 [ 236.086991][ T3286] RAX: 0000000000000075 RBX: ffff8880d4624c20 RCX: 0000000000000000 [ 236.088000][ T3286] RDX: 0000000000000075 RSI: 0000000000000008 RDI: ffffed1015552ebf [ 236.098897][ T3286] RBP: ffff88809b53d200 R08: ffffed101b3c04f9 R09: ffffed101b3c04f9 [ 236.099960][ T3286] R10: 00000000308769a1 R11: ffffed101b3c04f8 R12: ffff8880d4624c28 [ 236.100974][ T3286] R13: ffff8880d4624c20 R14: 0000000040310100 R15: ffff8880ce17ee02 [ 236.138967][ T3286] FS: 00007f23479fa680(0000) GS:ffff8880d9c00000(0000) knlGS:0000000000000000 [ 236.144852][ T3286] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 236.145720][ T3286] CR2: 00007f4a14bab210 CR3: 00000000a61c6001 CR4: 00000000000606f0 [ 236.146776][ T3286] Call Trace: [ 236.147222][ T3286] hsr_add_node+0x314/0x490 [hsr] [ 236.153633][ T3286] hsr_forward_skb+0x2b6/0x1bc0 [hsr] [ 236.154362][ T3286] ? rcu_read_lock_sched_held+0x90/0xc0 [ 236.155091][ T3286] ? rcu_read_lock_bh_held+0xa0/0xa0 [ 236.156607][ T3286] hsr_dev_xmit+0x70/0xd0 [hsr] [ 236.157254][ T3286] dev_hard_start_xmit+0x160/0x740 [ 236.157941][ T3286] __dev_queue_xmit+0x1961/0x2e10 [ 236.158565][ T3286] ? netdev_core_pick_tx+0x2e0/0x2e0
[ ... ]
--- net/hsr/hsr_device.c | 7 ++-- net/hsr/hsr_framereg.c | 73 ++++++++++++++++++++++++++---------------- net/hsr/hsr_framereg.h | 6 ++-- net/hsr/hsr_main.c | 2 +- net/hsr/hsr_main.h | 5 +-- 5 files changed, 56 insertions(+), 37 deletions(-)
net/hsr/hsr_device.c +4 -3
@@ -368,7 +368,7 @@ static void hsr_dev_destroy(struct net_device *hsr_dev)del_timer_sync (&hsr->prune_timer);del_timer_sync (&hsr->announce_timer); -hsr_del_self_node (&hsr->self_node_db); +hsr_del_self_node (hsr);hsr_del_nodes (&hsr->node_db); }
@@ -440,11 +440,12 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],INIT_LIST_HEAD (&hsr->ports);INIT_LIST_HEAD (&hsr->node_db);INIT_LIST_HEAD (&hsr->self_node_db); +spin_lock_init (&hsr->list_lock);ether_addr_copy (hsr_dev->dev_addr, slave[0 ]->dev_addr);/* Make sure we recognize frames from ourselves in hsr_rcv() */ - res =hsr_create_self_node (&hsr->self_node_db, hsr_dev->dev_addr, + res =hsr_create_self_node (hsr, hsr_dev->dev_addr, slave[1 ]->dev_addr);if (res <0 )return res;
@@ -502,7 +503,7 @@ int hsr_dev_finalize(struct net_device *hsr_dev, struct net_device *slave[2],list_for_each_entry_safe (port, tmp, &hsr->ports, port_list)hsr_del_port (port); err_add_master: -hsr_del_self_node (&hsr->self_node_db); +hsr_del_self_node (hsr);return res; }
net/hsr/hsr_framereg.c +46 -27
175 lines not on this page · raw message
net/hsr/hsr_framereg.h +2 -4
@@ -12,10 +12,8 @@struct hsr_node ; -void hsr_del_self_node (struct list_head *self_node_db); +void hsr_del_self_node (struct hsr_priv *hsr);void hsr_del_nodes (struct list_head *node_db); -struct hsr_node *hsr_add_node (struct list_head *node_db,unsigned char addr[], -u16 seq_out);struct hsr_node *hsr_get_node (struct hsr_port *port,struct sk_buff *skb,bool is_sup); void hsr_handle_sup_frame(struct sk_buff *skb, struct hsr_node *node_curr,
@@ -33,7 +31,7 @@ int hsr_register_frame_out(struct hsr_port *port, struct hsr_node *node,void hsr_prune_nodes (struct timer_list *t); -int hsr_create_self_node (struct list_head *self_node_db, +int hsr_create_self_node (struct hsr_priv *hsr,unsigned char addr_a[ETH_ALEN ],unsigned char addr_b[ETH_ALEN ]);
net/hsr/hsr_main.c +1 -1
@@ -67,7 +67,7 @@ static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event,/* Make sure we recognize frames from ourselves in hsr_rcv() */ port =hsr_port_get_hsr (hsr,HSR_PT_SLAVE_B ); - res = hsr_create_self_node(&hsr->self_node_db, + res = hsr_create_self_node(hsr, master->dev->dev_addr, port ? port->dev->dev_addr :
net/hsr/hsr_main.h +3 -2
@@ -160,8 +160,9 @@ struct hsr_priv {int announce_count;u16 sequence_nr;u16 sup_sequence_nr;/* For HSRv1 separate seq_nr for supervision */ -u8 prot_version;/* Indicate if HSRv0 or HSRv1. */ -spinlock_t seqnr_lock;/* locking for sequence_nr */ +u8 prot_version;/* Indicate if HSRv0 or HSRv1. */ +spinlock_t seqnr_lock;/* locking for sequence_nr */ +spinlock_t list_lock;/* locking for node list */ unsigned char sup_multicast_addr[ETH_ALEN ];#ifdef CONFIG_DEBUG_FS struct dentry *node_tbl_root;
Signature · 1 line
2.17.1