net: fix bonding ipsec offload problems
Subsystems (5)
v2 cover net: fix bonding ipsec offload problems
This series fixes some problems related to bonding ipsec offload.
The 1, 5, and 8th patches are to add a missing rcu_read_lock(). The 2nd patch is to add null check code to bond_ipsec_add_sa. When bonding interface doesn't have an active real interface, the bond->curr_active_slave pointer is null.
But bond_ipsec_add_sa() uses that pointer without null check. So that it results in null-ptr-deref.
The 3 and 4th patches are to replace xs->xso.dev with xs->xso.real_dev. The 6th patch is to disallow to set ipsec offload if a real interface type is bonding.
The 7th patch is to add struct bond_ipsec to manage SA.
If bond mode is changed, or active real interface is changed, SA should be removed from old current active real interface then it should be added to new active real interface.
But it can't, because it doesn't manage SA.
The 9th patch is to fix incorrect return value of bond_ipsec_offload_ok().
v1 -> v2:
- Add 9th patch.
- Do not print warning when there is no SA in bond_ipsec_add_sa_all().
- Add comment for ipsec_lock.
Taehee Yoo (9):
bonding: fix suspicious RCU usage in bond_ipsec_add_sa()
bonding: fix null dereference in bond_ipsec_add_sa()
net: netdevsim: use xso.real_dev instead of xso.dev in callback
functions of struct xfrmdev_ops
ixgbevf: use xso.real_dev instead of xso.dev in callback functions of
struct xfrmdev_ops
bonding: fix suspicious RCU usage in bond_ipsec_del_sa()
bonding: disallow setting nested bonding + ipsec offload
bonding: Add struct bond_ipesc to manage SA
bonding: fix suspicious RCU usage in bond_ipsec_offload_ok()
bonding: fix incorrect return value of bond_ipsec_offload_ok()
drivers/net/bonding/bond_main.c | 181 +++++++++++++++++---- drivers/net/ethernet/intel/ixgbevf/ipsec.c | 20 ++- drivers/net/netdevsim/ipsec.c | 8 +- include/net/bonding.h | 9 +- 4 files changed, 178 insertions(+), 40 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/9 bonding: fix suspicious RCU usage in bond_ipsec_add_sa()
To dereference bond->curr_active_slave, it uses rcu_dereference(). But it and the caller doesn't acquire RCU so a warning occurs. So add rcu_read_lock().
Test commands:
ip link add dummy0 type dummy
ip link add bond0 type bond
ip link set dummy0 master bond0
ip link set dummy0 up
ip link set bond0 up
ip x s add proto esp dst 14.1.1.1 src 15.1.1.1 spi 0x07 \
mode transport \
reqid 0x07 replay-window 32 aead 'rfc4106(gcm(aes))' \
0x44434241343332312423222114131211f4f3f2f1 128 sel \
src 14.0.0.52/24 dst 14.0.0.70/24 proto tcp offload \
dev bond0 dir in
Splat looks like:
=============================
WARNING: suspicious RCU usage
5.13.0-rc3+ #1168 Not tainted
-----------------------------drivers/net/bonding/bond_main.c:411 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
1 lock held by ip/684:
#0: ffffffff9a2757c0 (&net->xfrm.xfrm_cfg_mutex){+.+.}-{3:3},
at: xfrm_netlink_rcv+0x59/0x80 [xfrm_user]
55.191733][ T684] stack backtrace:
CPU: 0 PID: 684 Comm: ip Not tainted 5.13.0-rc3+ #1168 Call Trace: dump_stack+0xa4/0xe5 bond_ipsec_add_sa+0x18c/0x1f0 [bonding] xfrm_dev_state_add+0x2a9/0x770 ? memcpy+0x38/0x60 xfrm_add_sa+0x2278/0x3b10 [xfrm_user] ? xfrm_get_policy+0xaa0/0xaa0 [xfrm_user] ? register_lock_class+0x1750/0x1750 xfrm_user_rcv_msg+0x331/0x660 [xfrm_user] ? rcu_read_lock_sched_held+0x91/0xc0 ? xfrm_user_state_lookup.constprop.39+0x320/0x320 [xfrm_user] ? find_held_lock+0x3a/0x1c0 ? mutex_lock_io_nested+0x1210/0x1210 ? sched_clock_cpu+0x18/0x170 netlink_rcv_skb+0x121/0x350 ? xfrm_user_state_lookup.constprop.39+0x320/0x320 [xfrm_user] ? netlink_ack+0x9d0/0x9d0 ? netlink_deliver_tap+0x17c/0xa50 xfrm_netlink_rcv+0x68/0x80 [xfrm_user] netlink_unicast+0x41c/0x610 ? netlink_attachskb+0x710/0x710 netlink_sendmsg+0x6b9/0xb70
[ ... ]
---
v1 -> v2:
- no change
drivers/net/bonding/bond_main.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +6 -1
@@ -403,10 +403,12 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs)struct net_device *bond_dev = xs->xso.dev;struct bonding *bond;struct slave *slave; +int err;if (!bond_dev)return -EINVAL ; +rcu_read_lock (); bond =netdev_priv (bond_dev); slave =rcu_dereference (bond->curr_active_slave); xs->xso.real_dev = slave->dev;
@@ -415,10 +417,13 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs)if (!(slave->dev->xfrmdev_ops && slave->dev->xfrmdev_ops->xdo_dev_state_add)) {slave_warn (bond_dev, slave->dev,"Slave does not support ipsec offload\n" ); +rcu_read_unlock ();return -EINVAL ; } -return slave->dev->xfrmdev_ops->xdo_dev_state_add (xs); + err = slave->dev->xfrmdev_ops->xdo_dev_state_add (xs); +rcu_read_unlock (); +return err; }/**
Signature · 1 line
2.17.1
PATCH v2 2/9 bonding: fix null dereference in bond_ipsec_add_sa()
In reply to Taehee YooIf bond doesn't have real device, bond->curr_active_slave is null. But bond_ipsec_add_sa() dereferences bond->curr_active_slave without null checking.
So, null-ptr-deref would occur.
Test commands:
ip link add bond0 type bond
ip link set bond0 up
ip x s add proto esp dst 14.1.1.1 src 15.1.1.1 spi \0x07 mode transport reqid 0x07 replay-window 32 aead 'rfc4106(gcm(aes))' \0x44434241343332312423222114131211f4f3f2f1 128 sel src 14.0.0.52/24 \
dst 14.0.0.70/24 proto tcp offload dev bond0 dir in
Splat looks like:
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] CPU: 4 PID: 680 Comm: ip Not tainted 5.13.0-rc3+ #1168 RIP: 0010:bond_ipsec_add_sa+0xc4/0x2e0 [bonding] Code: 85 21 02 00 00 4d 8b a6 48 0c 00 00 e8 75 58 44 ce 85 c0 0f 85 14 01 00 00 48 b8 00 00 00 00 00 fc ff df 4c 89 e2 48 c1 ea 03 <80> 3c 02 00 0f 85 fc 01 00 00 48 8d bb e0 02 00 00 4d 8b 2c 24 48 RSP: 0018:ffff88810946f508 EFLAGS: 00010246 RAX: dffffc0000000000 RBX: ffff88810b4e8040 RCX: 0000000000000001 RDX: 0000000000000000 RSI: ffffffff8fe34280 RDI: ffff888115abe100 RBP: ffff88810946f528 R08: 0000000000000003 R09: fffffbfff2287e11 R10: 0000000000000001 R11: ffff888115abe0c8 R12: 0000000000000000 R13: ffffffffc0aea9a0 R14: ffff88800d7d2000 R15: ffff88810b4e8330 FS: 00007efc5552e680(0000) GS:ffff888119c00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055c2530dbf40 CR3: 0000000103056004 CR4: 00000000003706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: xfrm_dev_state_add+0x2a9/0x770 ? memcpy+0x38/0x60 xfrm_add_sa+0x2278/0x3b10 [xfrm_user] ? xfrm_get_policy+0xaa0/0xaa0 [xfrm_user] ? register_lock_class+0x1750/0x1750 xfrm_user_rcv_msg+0x331/0x660 [xfrm_user] ? rcu_read_lock_sched_held+0x91/0xc0 ? xfrm_user_state_lookup.constprop.39+0x320/0x320 [xfrm_user] ? find_held_lock+0x3a/0x1c0 ? mutex_lock_io_nested+0x1210/0x1210 ? sched_clock_cpu+0x18/0x170 netlink_rcv_skb+0x121/0x350 ? xfrm_user_state_lookup.constprop.39+0x320/0x320 [xfrm_user] ? netlink_ack+0x9d0/0x9d0 ? netlink_deliver_tap+0x17c/0xa50 xfrm_netlink_rcv+0x68/0x80 [xfrm_user] netlink_unicast+0x41c/0x610 ? netlink_attachskb+0x710/0x710 netlink_sendmsg+0x6b9/0xb70
[ ...]
---
v1 -> v2:
- no change
drivers/net/bonding/bond_main.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/net/bonding/bond_main.c +5 -0
@@ -411,6 +411,11 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs)rcu_read_lock (); bond =netdev_priv (bond_dev); slave =rcu_dereference (bond->curr_active_slave); +if (!slave) { +rcu_read_unlock (); +return -ENODEV ; + } + xs->xso.real_dev = slave->dev; bond->xs = xs;
Signature · 1 line
2.17.1
PATCH v2 3/9 net: netdevsim: use xso.real_dev instead of xso.dev in callback functions of struct xfrmdev_ops
In reply to Taehee YooThere are two pointers in struct xfrm_state_offload, *dev, *real_dev. These are used in callback functions of struct xfrmdev_ops. The *dev points whether bonding interface or real interface. If bonding ipsec offload is used, it points bonding interface If not, it points real interface.
And real_dev always points real interface.
So, netdevsim should always use real_dev instead of dev. Of course, real_dev always not be null.
Test commands:
ip netns add A
ip netns exec A bash
modprobe netdevsim
echo "1 1" > /sys/bus/netdevsim/new_device
ip link add bond0 type bond mode active-backup
ip link set eth0 master bond0
ip link set eth0 up
ip link set bond0 up
ip x s add proto esp dst 14.1.1.1 src 15.1.1.1 spi 0x07 mode \
transport reqid 0x07 replay-window 32 aead 'rfc4106(gcm(aes))' \0x44434241343332312423222114131211f4f3f2f1 128 sel src 14.0.0.52/24 \
dst 14.0.0.70/24 proto tcp offload dev bond0 dir in
Splat looks like:
BUG: spinlock bad magic on CPU#5, kworker/5:1/53 lock: 0xffff8881068c2cc8, .magic: 11121314, .owner: <none>/-1, .owner_cpu: -235736076 CPU: 5 PID: 53 Comm: kworker/5:1 Not tainted 5.13.0-rc3+ #1168 Workqueue: events linkwatch_event Call Trace: dump_stack+0xa4/0xe5 do_raw_spin_lock+0x20b/0x270 ? rwlock_bug.part.1+0x90/0x90 _raw_spin_lock_nested+0x5f/0x70 bond_get_stats+0xe4/0x4c0 [bonding] ? rcu_read_lock_sched_held+0xc0/0xc0 ? bond_neigh_init+0x2c0/0x2c0 [bonding] ? dev_get_alias+0xe2/0x190 ? dev_get_port_parent_id+0x14a/0x360 ? rtnl_unregister+0x190/0x190 ? dev_get_phys_port_name+0xa0/0xa0 ? memset+0x1f/0x40 ? memcpy+0x38/0x60 ? rtnl_phys_switch_id_fill+0x91/0x100 dev_get_stats+0x8c/0x270 rtnl_fill_stats+0x44/0xbe0 ? nla_put+0xbe/0x140 rtnl_fill_ifinfo+0x1054/0x3ad0
[ ... ]
---
v1 -> v2:
- no change
drivers/net/netdevsim/ipsec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/netdevsim/ipsec.c +4 -4
@@ -85,7 +85,7 @@ static int nsim_ipsec_parse_proto_keys(struct xfrm_state *xs, u32 *mykey, u32 *mysalt) {const char aes_gcm_name[] ="rfc4106(gcm(aes))" ; -struct net_device *dev = xs->xso.dev; +struct net_device *dev = xs->xso.real_dev;unsigned char *key_data;char *alg_name =NULL ;int key_len;
@@ -134,7 +134,7 @@ static int nsim_ipsec_add_sa(struct xfrm_state *xs)u16 sa_idx;int ret; - dev = xs->xso.dev; + dev = xs->xso.real_dev; ns =netdev_priv (dev); ipsec = &ns->ipsec;
@@ -194,7 +194,7 @@ static int nsim_ipsec_add_sa(struct xfrm_state *xs)static void nsim_ipsec_del_sa (struct xfrm_state *xs) { -struct netdevsim *ns =netdev_priv (xs->xso.dev); +struct netdevsim *ns =netdev_priv (xs->xso.real_dev);struct nsim_ipsec *ipsec = &ns->ipsec;u16 sa_idx;
@@ -211,7 +211,7 @@ static void nsim_ipsec_del_sa(struct xfrm_state *xs)static bool nsim_ipsec_offload_ok (struct sk_buff *skb,struct xfrm_state *xs) { -struct netdevsim *ns =netdev_priv (xs->xso.dev); +struct netdevsim *ns =netdev_priv (xs->xso.real_dev);struct nsim_ipsec *ipsec = &ns->ipsec; ipsec->ok++;
Signature · 1 line
2.17.1
PATCH v2 4/9 ixgbevf: use xso.real_dev instead of xso.dev in callback functions of struct xfrmdev_ops
In reply to Taehee YooThere are two pointers in struct xfrm_state_offload, *dev, *real_dev. These are used in callback functions of struct xfrmdev_ops. The *dev points whether bonding interface or real interface. If bonding ipsec offload is used, it points bonding interface If not, it points real interface.
And real_dev always points real interface.
So, ixgbevf should always use real_dev instead of dev.
Of course, real_dev always not be null.
Test commands:
ip link add bond0 type bond
#eth0 is ixgbevf interface
ip link set eth0 master bond0
ip link set bond0 up
ip x s add proto esp dst 14.1.1.1 src 15.1.1.1 spi 0x07 mode \
transport reqid 0x07 replay-window 32 aead 'rfc4106(gcm(aes))' \0x44434241343332312423222114131211f4f3f2f1 128 sel src 14.0.0.52/24 \
dst 14.0.0.70/24 proto tcp offload dev bond0 dir in
Splat looks like:
KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] CPU: 6 PID: 688 Comm: ip Not tainted 5.13.0-rc3+ #1168 RIP: 0010:ixgbevf_ipsec_find_empty_idx+0x28/0x1b0 [ixgbevf] Code: 00 00 0f 1f 44 00 00 55 53 48 89 fb 48 83 ec 08 40 84 f6 0f 84 9c 00 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <0f> b6 04 02 84 c0 74 08 3c 01 0f 8e 4c 01 00 00 66 81 3b 00 04 0f RSP: 0018:ffff8880089af390 EFLAGS: 00010246 RAX: dffffc0000000000 RBX: 0000000000000000 RCX: 0000000000000001 RDX: 0000000000000000 RSI: 0000000000000001 RDI: 0000000000000000 RBP: ffff8880089af4f8 R08: 0000000000000003 R09: fffffbfff4287e11 R10: 0000000000000001 R11: ffff888005de8908 R12: 0000000000000000 R13: ffff88810936a000 R14: ffff88810936a000 R15: ffff888004d78040 FS: 00007fdf9883a680(0000) GS:ffff88811a400000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000055bc14adbf40 CR3: 000000000b87c005 CR4: 00000000003706e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: ixgbevf_ipsec_add_sa+0x1bf/0x9c0 [ixgbevf] ? rcu_read_lock_sched_held+0x91/0xc0 ? ixgbevf_ipsec_parse_proto_keys.isra.9+0x280/0x280 [ixgbevf] ? lock_acquire+0x191/0x720 ? bond_ipsec_add_sa+0x48/0x350 [bonding] ? lockdep_hardirqs_on_prepare+0x3e0/0x3e0 ? rcu_read_lock_held+0x91/0xa0 ? rcu_read_lock_sched_held+0xc0/0xc0 bond_ipsec_add_sa+0x193/0x350 [bonding] xfrm_dev_state_add+0x2a9/0x770 ? memcpy+0x38/0x60 xfrm_add_sa+0x2278/0x3b10 [xfrm_user] ? xfrm_get_policy+0xaa0/0xaa0 [xfrm_user] ? register_lock_class+0x1750/0x1750 xfrm_user_rcv_msg+0x331/0x660 [xfrm_user] ? rcu_read_lock_sched_held+0x91/0xc0 ? xfrm_user_state_lookup.constprop.39+0x320/0x320 [xfrm_user] ? find_held_lock+0x3a/0x1c0 ? mutex_lock_io_nested+0x1210/0x1210 ? sched_clock_cpu+0x18/0x170 netlink_rcv_skb+0x121/0x350
[ ... ]
---
- no change
drivers/net/ethernet/intel/ixgbevf/ipsec.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/net/ethernet/intel/ixgbevf/ipsec.c +13 -7
@@ -211,7 +211,7 @@ struct xfrm_state *ixgbevf_ipsec_find_rx_state(struct ixgbevf_ipsec *ipsec,static int ixgbevf_ipsec_parse_proto_keys (struct xfrm_state *xs,u32 *mykey,u32 *mysalt) { -struct net_device *dev = xs->xso.dev; +struct net_device *dev = xs->xso.real_dev;unsigned char *key_data;char *alg_name =NULL ;int key_len;
@@ -260,12 +260,15 @@ static int ixgbevf_ipsec_parse_proto_keys(struct xfrm_state *xs,**/ static int ixgbevf_ipsec_add_sa (struct xfrm_state *xs) { -struct net_device *dev = xs->xso.dev; -struct ixgbevf_adapter *adapter =netdev_priv (dev); -struct ixgbevf_ipsec *ipsec = adapter->ipsec; +struct net_device *dev = xs->xso.real_dev; +struct ixgbevf_adapter *adapter; +struct ixgbevf_ipsec *ipsec;u16 sa_idx;int ret; + adapter =netdev_priv (dev); + ipsec = adapter->ipsec; +if (xs->id.proto !=IPPROTO_ESP && xs->id.proto !=IPPROTO_AH ) {netdev_err (dev,"Unsupported protocol 0x%04x for IPsec offload\n" , xs->id.proto);
@@ -383,11 +386,14 @@ static int ixgbevf_ipsec_add_sa(struct xfrm_state *xs)**/ static void ixgbevf_ipsec_del_sa (struct xfrm_state *xs) { -struct net_device *dev = xs->xso.dev; -struct ixgbevf_adapter *adapter =netdev_priv (dev); -struct ixgbevf_ipsec *ipsec = adapter->ipsec; +struct net_device *dev = xs->xso.real_dev; +struct ixgbevf_adapter *adapter; +struct ixgbevf_ipsec *ipsec;u16 sa_idx; + adapter =netdev_priv (dev); + ipsec = adapter->ipsec; +if (xs->xso.flags &XFRM_OFFLOAD_INBOUND ) { sa_idx = xs->xso.offload_handle -IXGBE_IPSEC_BASE_RX_INDEX ;
Signature · 1 line
2.17.1
PATCH v2 5/9 bonding: fix suspicious RCU usage in bond_ipsec_del_sa()
In reply to Taehee YooTo dereference bond->curr_active_slave, it uses rcu_dereference(). But it and the caller doesn't acquire RCU so a warning occurs. So add rcu_read_lock().
Test commands:
ip netns add A
ip netns exec A bash
modprobe netdevsim
echo "1 1" > /sys/bus/netdevsim/new_device
ip link add bond0 type bond
ip link set eth0 master bond0
ip link set eth0 up
ip link set bond0 up
ip x s add proto esp dst 14.1.1.1 src 15.1.1.1 spi 0x07 mode \
transport reqid 0x07 replay-window 32 aead 'rfc4106(gcm(aes))' \0x44434241343332312423222114131211f4f3f2f1 128 sel src 14.0.0.52/24 \
dst 14.0.0.70/24 proto tcp offload dev bond0 dir in
ip x s f
Splat looks like:
=============================
WARNING: suspicious RCU usage
5.13.0-rc3+ #1168 Not tainted
-----------------------------drivers/net/bonding/bond_main.c:448 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
2 locks held by ip/705:
#0: ffff888106701780 (&net->xfrm.xfrm_cfg_mutex){+.+.}-{3:3},
at: xfrm_netlink_rcv+0x59/0x80 [xfrm_user]
#1: ffff8880075b0098 (&x->lock){+.-.}-{2:2},
at: xfrm_state_delete+0x16/0x30
stack backtrace: CPU: 6 PID: 705 Comm: ip Not tainted 5.13.0-rc3+ #1168 Call Trace: dump_stack+0xa4/0xe5 bond_ipsec_del_sa+0x16a/0x1c0 [bonding] __xfrm_state_delete+0x51f/0x730 xfrm_state_delete+0x1e/0x30 xfrm_state_flush+0x22f/0x390 xfrm_flush_sa+0xd8/0x260 [xfrm_user] ? xfrm_flush_policy+0x290/0x290 [xfrm_user] xfrm_user_rcv_msg+0x331/0x660 [xfrm_user] ? rcu_read_lock_sched_held+0x91/0xc0 ? xfrm_user_state_lookup.constprop.39+0x320/0x320 [xfrm_user] ? find_held_lock+0x3a/0x1c0 ? mutex_lock_io_nested+0x1210/0x1210 ? sched_clock_cpu+0x18/0x170 netlink_rcv_skb+0x121/0x350
[ ... ]
---
v1 -> v2:
- no change
drivers/net/bonding/bond_main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/net/bonding/bond_main.c +5 -2
@@ -444,21 +444,24 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs)if (!bond_dev)return ; +rcu_read_lock (); bond =netdev_priv (bond_dev); slave =rcu_dereference (bond->curr_active_slave);if (!slave) -return ; + goto out; xs->xso.real_dev = slave->dev;if (!(slave->dev->xfrmdev_ops && slave->dev->xfrmdev_ops->xdo_dev_state_delete)) {slave_warn (bond_dev, slave->dev,"%s: no slave xdo_dev_state_delete\n" , __func__); -return ; + goto out; } slave->dev->xfrmdev_ops->xdo_dev_state_delete (xs); +out: +rcu_read_unlock (); }/**
Signature · 1 line
2.17.1
PATCH v2 6/9 bonding: disallow setting nested bonding + ipsec offload
In reply to Taehee Yoobonding interface can be nested and it supports ipsec offload. So, it allows setting the nested bonding + ipsec scenario. But code does not support this scenario.
So, it should be disallowed.
interface graph:
bond2
|
bond1
|
eth0
The nested bonding + ipsec offload may not a real usecase. So, disallowing this scenario is fine.
---
v1 -> v2:
- no change
drivers/net/bonding/bond_main.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/net/bonding/bond_main.c +9 -6
@@ -419,8 +419,9 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs) xs->xso.real_dev = slave->dev; bond->xs = xs; -if (!(slave->dev->xfrmdev_ops - && slave->dev->xfrmdev_ops->xdo_dev_state_add)) { +if (!slave->dev->xfrmdev_ops || + !slave->dev->xfrmdev_ops->xdo_dev_state_add || +netif_is_bond_master (slave->dev)) {slave_warn (bond_dev, slave->dev,"Slave does not support ipsec offload\n" );rcu_read_unlock ();return -EINVAL ;
@@ -453,8 +454,9 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs) xs->xso.real_dev = slave->dev; -if (!(slave->dev->xfrmdev_ops - && slave->dev->xfrmdev_ops->xdo_dev_state_delete)) { +if (!slave->dev->xfrmdev_ops || + !slave->dev->xfrmdev_ops->xdo_dev_state_delete || +netif_is_bond_master (slave->dev)) {slave_warn (bond_dev, slave->dev,"%s: no slave xdo_dev_state_delete\n" , __func__); goto out; }
@@ -479,8 +481,9 @@ static bool bond_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *xs)if (BOND_MODE (bond) !=BOND_MODE_ACTIVEBACKUP )return true; -if (!(slave_dev->xfrmdev_ops - && slave_dev->xfrmdev_ops->xdo_dev_offload_ok)) { +if (!slave_dev->xfrmdev_ops || + !slave_dev->xfrmdev_ops->xdo_dev_offload_ok || +netif_is_bond_master (slave_dev)) {slave_warn (bond_dev, slave_dev,"%s: no slave xdo_dev_offload_ok\n" , __func__);return false; }
Signature · 1 line
2.17.1
PATCH v2 7/9 bonding: Add struct bond_ipesc to manage SA
In reply to Taehee Yoobonding has been supporting ipsec offload.
When SA is added, bonding just passes SA to its own active real interface. But it doesn't manage SA.
So, when events(add/del real interface, active real interface change, etc) occur, bonding can't handle that well because It doesn't manage SA. So some problems(panic, UAF, refcnt leak)occur.
In order to make it stable, it should manage SA.
That's the reason why struct bond_ipsec is added.
When a new SA is added to bonding interface, it is stored in the bond_ipsec list. And the SA is passed to a current active real interface. If events occur, it uses bond_ipsec data to handle these events. bond->ipsec_list is protected by bond->ipsec_lock.
If a current active real interface is changed, the following logic works.
1. delete all SAs from old active real interface
2. Add all SAs to the new active real interface.
3. If a new active real interface doesn't support ipsec offload or SA's option, it sets real_dev to NULL.
---
- Do not print unncessary warning in bond_ipsec_add_sa_all()
- Add comment for ipsec_lock
drivers/net/bonding/bond_main.c | 139 +++++++++++++++++++++++++++----- include/net/bonding.h | 9 ++- 2 files changed, 127 insertions(+), 21 deletions(-)
drivers/net/bonding/bond_main.c +119 -20
@@ -401,6 +401,7 @@ static int bond_vlan_rx_kill_vid(struct net_device *bond_dev,static int bond_ipsec_add_sa (struct xfrm_state *xs) {struct net_device *bond_dev = xs->xso.dev; +struct bond_ipsec *ipsec;struct bonding *bond;struct slave *slave;int err;
@@ -416,9 +417,6 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs)return -ENODEV ; } - xs->xso.real_dev = slave->dev; - bond->xs = xs; -if (!slave->dev->xfrmdev_ops || !slave->dev->xfrmdev_ops->xdo_dev_state_add ||netif_is_bond_master (slave->dev)) {
@@ -427,11 +425,63 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs)return -EINVAL ; } + ipsec =kmalloc (sizeof (*ipsec),GFP_ATOMIC ); +if (!ipsec) { +rcu_read_unlock (); +return -ENOMEM ; + } + xs->xso.real_dev = slave->dev; + err = slave->dev->xfrmdev_ops->xdo_dev_state_add (xs); +if (!err) { + ipsec->xs = xs; +INIT_LIST_HEAD (&ipsec->list); +spin_lock_bh (&bond->ipsec_lock); +list_add (&ipsec->list, &bond->ipsec_list); +spin_unlock_bh (&bond->ipsec_lock); + }else { +kfree (ipsec); + }rcu_read_unlock ();return err; } +static void bond_ipsec_add_sa_all (struct bonding *bond) +{ +struct net_device *bond_dev = bond->dev; +struct bond_ipsec *ipsec; +struct slave *slave; + +rcu_read_lock (); + slave =rcu_dereference (bond->curr_active_slave); +if (!slave) + goto out; + +if (!slave->dev->xfrmdev_ops || + !slave->dev->xfrmdev_ops->xdo_dev_state_add || +netif_is_bond_master (slave->dev)) { +spin_lock_bh (&bond->ipsec_lock); +if (!list_empty (&bond->ipsec_list)) +slave_warn (bond_dev, slave->dev, +"%s: no slave xdo_dev_state_add\n" , + __func__); +spin_unlock_bh (&bond->ipsec_lock); + goto out; + } + +spin_lock_bh (&bond->ipsec_lock); +list_for_each_entry (ipsec, &bond->ipsec_list, list) { + ipsec->xs->xso.real_dev = slave->dev; +if (slave->dev->xfrmdev_ops->xdo_dev_state_add (ipsec->xs)) { +slave_warn (bond_dev, slave->dev,"%s: failed to add SA\n" , __func__); + ipsec->xs->xso.real_dev =NULL ; + } + } +spin_unlock_bh (&bond->ipsec_lock); +out: +rcu_read_unlock (); +} +/** * bond_ipsec_del_sa - clear out this specific SA * @xs: pointer to transformer state struct
@@ -439,6 +489,7 @@ static int bond_ipsec_add_sa(struct xfrm_state *xs)static void bond_ipsec_del_sa (struct xfrm_state *xs) {struct net_device *bond_dev = xs->xso.dev; +struct bond_ipsec *ipsec;struct bonding *bond;struct slave *slave;
@@ -452,7 +503,10 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs)if (!slave) goto out; - xs->xso.real_dev = slave->dev; +if (!xs->xso.real_dev) + goto out; + +WARN_ON (xs->xso.real_dev != slave->dev); if (!slave->dev->xfrmdev_ops || !slave->dev->xfrmdev_ops->xdo_dev_state_delete ||
@@ -463,6 +517,48 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs) slave->dev->xfrmdev_ops->xdo_dev_state_delete (xs); out: +spin_lock_bh (&bond->ipsec_lock); +list_for_each_entry (ipsec, &bond->ipsec_list, list) { +if (ipsec->xs == xs) { +list_del (&ipsec->list); +kfree (ipsec); +break ; + } + } +spin_unlock_bh (&bond->ipsec_lock); +rcu_read_unlock (); +} + +static void bond_ipsec_del_sa_all (struct bonding *bond) +{ +struct net_device *bond_dev = bond->dev; +struct bond_ipsec *ipsec; +struct slave *slave; + +rcu_read_lock (); + slave =rcu_dereference (bond->curr_active_slave); +if (!slave) { +rcu_read_unlock (); +return ; + } + +spin_lock_bh (&bond->ipsec_lock); +list_for_each_entry (ipsec, &bond->ipsec_list, list) { +if (!ipsec->xs->xso.real_dev) +continue ; + +if (!slave->dev->xfrmdev_ops || + !slave->dev->xfrmdev_ops->xdo_dev_state_delete || +netif_is_bond_master (slave->dev)) { +slave_warn (bond_dev, slave->dev, +"%s: no slave xdo_dev_state_delete\n" , + __func__); + }else { + slave->dev->xfrmdev_ops->xdo_dev_state_delete (ipsec->xs); + } + ipsec->xs->xso.real_dev =NULL ; + } +spin_unlock_bh (&bond->ipsec_lock);rcu_read_unlock (); }
@@ -474,22 +570,27 @@ static void bond_ipsec_del_sa(struct xfrm_state *xs)static bool bond_ipsec_offload_ok (struct sk_buff *skb,struct xfrm_state *xs) {struct net_device *bond_dev = xs->xso.dev; -struct bonding *bond =netdev_priv (bond_dev); -struct slave *curr_active =rcu_dereference (bond->curr_active_slave); -struct net_device *slave_dev = curr_active->dev; +struct net_device *real_dev; +struct slave *curr_active; +struct bonding *bond; + + bond =netdev_priv (bond_dev); + curr_active =rcu_dereference (bond->curr_active_slave); + real_dev = curr_active->dev;if (BOND_MODE (bond) !=BOND_MODE_ACTIVEBACKUP )return true; -if (!slave_dev->xfrmdev_ops || - !slave_dev->xfrmdev_ops->xdo_dev_offload_ok || -netif_is_bond_master (slave_dev)) { -slave_warn (bond_dev, slave_dev,"%s: no slave xdo_dev_offload_ok\n" , __func__); +if (!xs->xso.real_dev) +return false; + +if (!real_dev->xfrmdev_ops || + !real_dev->xfrmdev_ops->xdo_dev_offload_ok || +netif_is_bond_master (real_dev)) {return false; } - xs->xso.real_dev = slave_dev; -return slave_dev->xfrmdev_ops->xdo_dev_offload_ok (skb, xs); +return real_dev->xfrmdev_ops->xdo_dev_offload_ok (skb, xs); }static const struct xfrmdev_ops bond_xfrmdev_ops = {
@@ -1006,8 +1107,7 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active)return ;#ifdef CONFIG_XFRM_OFFLOAD -if (old_active && bond->xs) -bond_ipsec_del_sa (bond->xs); +bond_ipsec_del_sa_all (bond);#endif /* CONFIG_XFRM_OFFLOAD */ if (new_active) {
@@ -1083,10 +1183,7 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active) }#ifdef CONFIG_XFRM_OFFLOAD -if (new_active && bond->xs) { -xfrm_dev_state_flush (dev_net (bond->dev), bond->dev, true); -bond_ipsec_add_sa (bond->xs); - } +bond_ipsec_add_sa_all (bond);#endif /* CONFIG_XFRM_OFFLOAD */ /* resend IGMP joins since active slave has changed or
@@ -3343,6 +3440,7 @@ static int bond_master_netdev_event(unsigned long event,return bond_event_changename (event_bond);case NETDEV_UNREGISTER :bond_remove_proc_entry (event_bond); +xfrm_dev_state_flush (dev_net (bond_dev), bond_dev, true);break ;case NETDEV_REGISTER :bond_create_proc_entry (event_bond);
@@ -4906,7 +5004,8 @@ void bond_setup(struct net_device *bond_dev)#ifdef CONFIG_XFRM_OFFLOAD /* set up xfrm device ops (only supported in active-backup right now) */ bond_dev->xfrmdev_ops = &bond_xfrmdev_ops; - bond->xs =NULL ; +INIT_LIST_HEAD (&bond->ipsec_list); +spin_lock_init (&bond->ipsec_lock);#endif /* CONFIG_XFRM_OFFLOAD */ /* don't acquire bond device's netif_tx_lock when transmitting */
include/net/bonding.h +8 -1
@@ -201,6 +201,11 @@ struct bond_up_slave {*/ #define BOND_LINK_NOCHANGE -1 +struct bond_ipsec { +struct list_head list; +struct xfrm_state *xs; +}; +/* * Here are the locking policies for the two bonding locks: * Get rcu_read_lock when reading or RTNL when writing slave list.
@@ -249,7 +254,9 @@ struct bonding {#endif /* CONFIG_DEBUG_FS */ struct rtnl_link_stats64 bond_stats;#ifdef CONFIG_XFRM_OFFLOAD -struct xfrm_state *xs; +struct list_head ipsec_list; +/* protecting ipsec_list */ +spinlock_t ipsec_lock;#endif /* CONFIG_XFRM_OFFLOAD */ };
Signature · 1 line
2.17.1
PATCH v2 8/9 bonding: fix suspicious RCU usage in bond_ipsec_offload_ok()
In reply to Taehee YooTo dereference bond->curr_active_slave, it uses rcu_dereference(). But it and the caller doesn't acquire RCU so a warning occurs. So add rcu_read_lock().
Splat looks like:
WARNING: suspicious RCU usage
5.13.0-rc6+ #1179 Not tainteddrivers/net/bonding/bond_main.c:571 suspiciousrcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
1 lock held by ping/974:
#0: ffff888109e7db70 (sk_lock-AF_INET){+.+.}-{0:0},
at: raw_sendmsg+0x1303/0x2cb0
stack backtrace: CPU: 2 PID: 974 Comm: ping Not tainted 5.13.0-rc6+ #1179 Call Trace: dump_stack+0xa4/0xe5 bond_ipsec_offload_ok+0x1f4/0x260 [bonding] xfrm_output+0x179/0x890 xfrm4_output+0xfa/0x410 ? __xfrm4_output+0x4b0/0x4b0 ? __ip_make_skb+0xecc/0x2030 ? xfrm4_udp_encap_rcv+0x800/0x800 ? ip_local_out+0x21/0x3a0 ip_send_skb+0x37/0xa0 raw_sendmsg+0x1bfd/0x2cb0
---
- no change
drivers/net/bonding/bond_main.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/net/bonding/bond_main.c +16 -6
@@ -573,24 +573,34 @@ static bool bond_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *xs)struct net_device *real_dev;struct slave *curr_active;struct bonding *bond; +int err; bond =netdev_priv (bond_dev); +rcu_read_lock (); curr_active =rcu_dereference (bond->curr_active_slave); real_dev = curr_active->dev; -if (BOND_MODE (bond) !=BOND_MODE_ACTIVEBACKUP ) -return true; +if (BOND_MODE (bond) !=BOND_MODE_ACTIVEBACKUP ) { + err = true; + goto out; + } -if (!xs->xso.real_dev) -return false; +if (!xs->xso.real_dev) { + err = false; + goto out; + }if (!real_dev->xfrmdev_ops || !real_dev->xfrmdev_ops->xdo_dev_offload_ok ||netif_is_bond_master (real_dev)) { -return false; + err = false; + goto out; } -return real_dev->xfrmdev_ops->xdo_dev_offload_ok (skb, xs); + err = real_dev->xfrmdev_ops->xdo_dev_offload_ok (skb, xs); +out: +rcu_read_unlock (); +return err; }static const struct xfrmdev_ops bond_xfrmdev_ops = {
Signature · 1 line
2.17.1
PATCH v2 9/9 bonding: fix incorrect return value of bond_ipsec_offload_ok()
In reply to Taehee Yoobond_ipsec_offload_ok() is called to check whether the interface supports ipsec offload or not.
bonding interface support ipsec offload only in active-backup mode. So, if a bond interface is not in active-backup mode, it should return false but it returns true.
---
v1 -> v2:
- newly added
drivers/net/bonding/bond_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/bonding/bond_main.c +1 -1
@@ -581,7 +581,7 @@ static bool bond_ipsec_offload_ok(struct sk_buff *skb, struct xfrm_state *xs) real_dev = curr_active->dev;if (BOND_MODE (bond) !=BOND_MODE_ACTIVEBACKUP ) { - err = true; + err = false; goto out; }
Signature · 1 line
2.17.1
Quoted 36 lines · Taehee Yoo
This series fixes some problems related to bonding ipsec offload.
The 1, 5, and 8th patches are to add a missing
rcu_read_lock(). The 2nd patch is to add null check code tobond_ipsec_add_sa. When bonding interface doesn't have an active real interface, thebond->curr_active_slavepointer is null.
Butbond_ipsec_add_sa()uses that pointer without null check. So that it results in null-ptr-deref.
The 3 and 4th patches are to replacexs->xso.devwithxs->xso.real_dev. The 6th patch is to disallow to set ipsec offload if a real interface type is bonding.
The 7th patch is to add structbond_ipsecto manage SA.
If bond mode is changed, or active real interface is changed, SA should be removed from old current active real interface then it should be added to new active real interface.
But it can't, because it doesn't manage SA.
The 9th patch is to fix incorrect return value ofbond_ipsec_offload_ok().v1 -> v2:
- Add 9th patch.
- Do not print warning when there is no SA inbond_ipsec_add_sa_all().
- Add comment foripsec_lock.Taehee Yoo (9):
bonding: fix suspicious RCU usage inbond_ipsec_add_sa()
bonding: fix null dereference inbond_ipsec_add_sa()
net: netdevsim: use xso.real_dev instead of xso.dev in callback
functions of structxfrmdev_ops
ixgbevf: use xso.real_dev instead of xso.dev in callback functions of
structxfrmdev_ops
bonding: fix suspicious RCU usage inbond_ipsec_del_sa()
bonding: disallow setting nested bonding + ipsec offload
bonding: Add structbond_ipescto manage SA
bonding: fix suspicious RCU usage inbond_ipsec_offload_ok()
bonding: fix incorrect return value ofbond_ipsec_offload_ok()
Quoted 5 lines
drivers/net/bonding/bond_main.c | 181 +++++++++++++++++---- drivers/net/ethernet/intel/ixgbevf/ipsec.c | 20 ++- drivers/net/netdevsim/ipsec.c | 8 +- include/net/bonding.h | 9 +- 4 files changed, 178 insertions(+), 40 deletions(-)
The bonding portion looks good to me.
-J
---
-Jay Vosburgh, jay.vosburgh at canonical.com