lkml.org 
[lkml]   [2016]   [Aug]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.7 05/41] net/bonding: Enforce active-backup policy for IPoIB bonds
    Date
    4.7-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Mark Bloch <markb@mellanox.com>

    [ Upstream commit 1533e77315220dc1d5ec3bd6d9fe32e2aa0a74c0 ]

    When using an IPoIB bond currently only active-backup mode is a valid
    use case and this commit strengthens it.

    Since commit 2ab82852a270 ("net/bonding: Enable bonding to enslave
    netdevices not supporting set_mac_address()") was introduced till
    4.7-rc1, IPoIB didn't support the set_mac_address ndo, and hence the
    fail over mac policy always applied to IPoIB bonds.

    With the introduction of commit 492a7e67ff83 ("IB/IPoIB: Allow setting
    the device address"), that doesn't hold and practically IPoIB bonds are
    broken as of that. To fix it, lets go to fail over mac if the device
    doesn't support the ndo OR this is IPoIB device.

    As a by-product, this commit also prevents a stack corruption which
    occurred when trying to copy 20 bytes (IPoIB) device address
    to a sockaddr struct that has only 16 bytes of storage.

    Signed-off-by: Mark Bloch <markb@mellanox.com>
    Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com>
    Signed-off-by: Saeed Mahameed <saeedm@mellanox.com>
    Acked-by: Andy Gospodarek <gospo@cumulusnetworks.com>
    Signed-off-by: Jay Vosburgh <jay.vosburgh@canonical.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/net/bonding/bond_main.c | 11 ++++++++++-
    1 file changed, 10 insertions(+), 1 deletion(-)

    --- a/drivers/net/bonding/bond_main.c
    +++ b/drivers/net/bonding/bond_main.c
    @@ -1422,7 +1422,16 @@ int bond_enslave(struct net_device *bond
    return -EINVAL;
    }

    - if (slave_ops->ndo_set_mac_address == NULL) {
    + if (slave_dev->type == ARPHRD_INFINIBAND &&
    + BOND_MODE(bond) != BOND_MODE_ACTIVEBACKUP) {
    + netdev_warn(bond_dev, "Type (%d) supports only active-backup mode\n",
    + slave_dev->type);
    + res = -EOPNOTSUPP;
    + goto err_undo_flags;
    + }
    +
    + if (!slave_ops->ndo_set_mac_address ||
    + slave_dev->type == ARPHRD_INFINIBAND) {
    netdev_warn(bond_dev, "The slave device specified does not support setting the MAC address\n");
    if (BOND_MODE(bond) == BOND_MODE_ACTIVEBACKUP &&
    bond->params.fail_over_mac != BOND_FOM_ACTIVE) {

    \
     
     \ /
      Last update: 2016-09-17 09:56    [W:4.129 / U:0.716 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site