aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/bonding
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2009-12-23 03:27:10 +0000
committerDavid S. Miller <davem@davemloft.net>2009-12-26 20:24:46 -0800
commitc99a3d2e04c63a795e13c26d6f2982731e1f1ae0 (patch)
tree2c0a8e24fe40fc6b4681fb5e3c3db18e0bbd6056 /drivers/net/bonding
parentFix MAC address access in 3c507, ibmlana, pcnet32 and libertas (diff)
downloadlinux-dev-c99a3d2e04c63a795e13c26d6f2982731e1f1ae0.tar.xz
linux-dev-c99a3d2e04c63a795e13c26d6f2982731e1f1ae0.zip
bond_3ad.c avoid possible null deref
A few lines earlier we assume that best->slave could be either null or non-null so we should check it here as well. Signed-off-by: Dan Carpenter <error27@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/bonding')
-rw-r--r--drivers/net/bonding/bond_3ad.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/bonding/bond_3ad.c b/drivers/net/bonding/bond_3ad.c
index 0fb7a4964e75..822f586d72af 100644
--- a/drivers/net/bonding/bond_3ad.c
+++ b/drivers/net/bonding/bond_3ad.c
@@ -1580,7 +1580,7 @@ static void ad_agg_selection_logic(struct aggregator *agg)
// check if any partner replys
if (best->is_individual) {
pr_warning("%s: Warning: No 802.3ad response from the link partner for any adapters in the bond\n",
- best->slave->dev->master->name);
+ best->slave ? best->slave->dev->master->name : "NULL");
}
best->is_active = 1;