diff options
author | Hong zhi guo <honkiko@gmail.com> | 2013-03-23 02:27:50 +0000 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-03-24 17:27:28 -0400 |
commit | 9b46922e15f4d9d2aedcd320c3b7f7f54d956da7 (patch) | |
tree | 3fd73d6097682ac338c6f78981dbc19f7a8a4825 /net | |
parent | 4a7df340ed1bac190c124c1601bfc10cde9fb4fb (diff) | |
download | linux-3.10-9b46922e15f4d9d2aedcd320c3b7f7f54d956da7.tar.gz linux-3.10-9b46922e15f4d9d2aedcd320c3b7f7f54d956da7.tar.bz2 linux-3.10-9b46922e15f4d9d2aedcd320c3b7f7f54d956da7.zip |
bridge: fix crash when set mac address of br interface
When I tried to set mac address of a bridge interface to a mac
address which already learned on this bridge, I got system hang.
The cause is straight forward: function br_fdb_change_mac_address
calls fdb_insert with NULL source nbp. Then an fdb lookup is
performed. If an fdb entry is found and it's local, it's OK. But
if it's not local, source is dereferenced for printk without NULL
check.
Signed-off-by: Hong Zhiguo <honkiko@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/bridge/br_fdb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bridge/br_fdb.c b/net/bridge/br_fdb.c index b0812c91c0f..bab338e6270 100644 --- a/net/bridge/br_fdb.c +++ b/net/bridge/br_fdb.c @@ -423,7 +423,7 @@ static int fdb_insert(struct net_bridge *br, struct net_bridge_port *source, return 0; br_warn(br, "adding interface %s with same address " "as a received packet\n", - source->dev->name); + source ? source->dev->name : br->dev->name); fdb_delete(br, fdb); } |