| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <AANLkTinpO=FmoecfV8epubXU4OrhFsXJ7-Kc68yNhMEs@mail.gmail.com> Date: Wed, 24 Nov 2010 15:12:14 -0800 From: David Strand <dpstrand@...il.com> To: netdev@...r.kernel.org Cc: Jay Vosburgh <fubar@...ibm.com>, linux-kernel@...r.kernel.org Subject: [PATCH] bonding: check for assigned mac before adopting the slaves mac address Restore the check for a missing mac address before adopting the first slaves as it's own. This regression was introduced in: http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.36.y.git;a=commit;h=c20811a79e671a6a1fe86a8c1afe04aca8a7f085 Signed-off-by: David Strand dpstrand@...il.com --- diff -uprN a/drivers/net/bonding/bond_main.c b/drivers/net/bonding/bond_main.c --- a/drivers/net/bonding/bond_main.c 2010-11-24 11:36:58.125640000 -0800 +++ b/drivers/net/bonding/bond_main.c 2010-11-24 11:40:58.175640000 -0800 @@ -1577,8 +1577,9 @@ int bond_enslave(struct net_device *bond /* If this is the first slave, then we need to set the master's hardware * address to be the same as the slave's. */ if (bond->slave_cnt == 0) - memcpy(bond->dev->dev_addr, slave_dev->dev_addr, - slave_dev->addr_len); + if (is_zero_ether_addr(bond->dev->dev_addr)) + memcpy(bond->dev->dev_addr, slave_dev->dev_addr, + slave_dev->addr_len); new_slave = kzalloc(sizeof(struct slave), GFP_KERNEL); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists