Commit 5cd24cbe authored by Jarod Wilson's avatar Jarod Wilson Committed by David S. Miller
Browse files

bonding: deal with xfrm state in all modes and add more error-checking 



It's possible that device removal happens when the bond is in non-AB mode,
and addition happens in AB mode, so bond_ipsec_del_sa() never gets called,
which leaves security associations in an odd state if bond_ipsec_add_sa()
then gets called after switching the bond into AB. Just call add and
delete universally for all modes to keep things consistent.

However, it's also possible that this code gets called when the system is
shutting down, and the xfrm subsystem has already been disconnected from
the bond device, so we need to do some error-checking and bail, lest we
hit a null ptr deref.

Fixes: a3b658cf ("bonding: allow xfrm offload setup post-module-load")
CC: Huy Nguyen <huyn@mellanox.com>
CC: Saeed Mahameed <saeedm@mellanox.com>
CC: Jay Vosburgh <j.vosburgh@gmail.com>
CC: Veaceslav Falico <vfalico@gmail.com>
CC: Andy Gospodarek <andy@greyhouse.net>
CC: "David S. Miller" <davem@davemloft.net>
CC: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
CC: Jakub Kicinski <kuba@kernel.org>
CC: Steffen Klassert <steffen.klassert@secunet.com>
CC: Herbert Xu <herbert@gondor.apana.org.au>
CC: netdev@vger.kernel.org
CC: intel-wired-lan@lists.osuosl.org
Signed-off-by: default avatarJarod Wilson <jarod@redhat.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 32e0d42a

drivers/net/bonding/bond_main.c

+25 −14
Original line number Diff line number Diff line
@@ -383,9 +383,14 @@ 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 bonding *bond = netdev_priv(bond_dev);

	struct slave *slave = rtnl_dereference(bond->curr_active_slave);

	struct bonding *bond;

	struct slave *slave;



	if (!bond_dev)

		return -EINVAL;



	bond = netdev_priv(bond_dev);

	slave = rtnl_dereference(bond->curr_active_slave);

	xs->xso.real_dev = slave->dev;

	bond->xs = xs;
@@ -405,8 +410,14 @@ 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 bonding *bond = netdev_priv(bond_dev);

	struct slave *slave = rtnl_dereference(bond->curr_active_slave);

	struct bonding *bond;

	struct slave *slave;



	if (!bond_dev)

		return;



	bond = netdev_priv(bond_dev);

	slave = rtnl_dereference(bond->curr_active_slave);



	if (!slave)

		return;
@@ -960,12 +971,12 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active) 
	if (old_active == new_active)

		return;



	if (new_active) {

#ifdef CONFIG_XFRM_OFFLOAD

		if ((BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP) && bond->xs)

	if (old_active && bond->xs)

		bond_ipsec_del_sa(bond->xs);

#endif /* CONFIG_XFRM_OFFLOAD */



	if (new_active) {

		new_active->last_link_up = jiffies;



		if (new_active->link == BOND_LINK_BACK) {
@@ -1028,13 +1039,6 @@ void bond_change_active_slave(struct bonding *bond, struct slave *new_active) 
					bond_should_notify_peers(bond);

			}



#ifdef CONFIG_XFRM_OFFLOAD

			if (old_active && bond->xs) {

				xfrm_dev_state_flush(dev_net(bond->dev), bond->dev, true);

				bond_ipsec_add_sa(bond->xs);

			}

#endif /* CONFIG_XFRM_OFFLOAD */



			call_netdevice_notifiers(NETDEV_BONDING_FAILOVER, bond->dev);

			if (should_notify_peers) {

				bond->send_peer_notif--;
@@ -1044,6 +1048,13 @@ 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);

	}

#endif /* CONFIG_XFRM_OFFLOAD */



	/* resend IGMP joins since active slave has changed or

	 * all were sent on curr_active_slave.

	 * resend only if bond is brought up with the affected

CRA Git | Maintained and supported by SUSTech CRA and CCSE