Skip to content

Commit

Permalink
netconsole: avoid null pointer dereference at show_local_mac()
Browse files Browse the repository at this point in the history
This patch avoids a null pointer dereference when we read local_mac 
for netconsole in configfs and shows default local mac address
value.

A null pointer dereference occurs when we call show_local_mac() via 
local_mac entry in configfs before we setup the content of netpoll
using netpoll_setup().

Signed-off-by: Keiichi KII <k-keiichi@bx.jp.nec.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Keiichi KII authored and David S. Miller committed Feb 15, 2008
1 parent b5c15fc commit 69c3683
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/net/netconsole.c
Original file line number Diff line number Diff line change
Expand Up @@ -309,8 +309,8 @@ static ssize_t show_local_mac(struct netconsole_target *nt, char *buf)
struct net_device *dev = nt->np.dev;

DECLARE_MAC_BUF(mac);
return snprintf(buf, PAGE_SIZE, "%s\n",
print_mac(mac, dev->dev_addr));
return snprintf(buf, PAGE_SIZE, "%s\n", dev ?
print_mac(mac, dev->dev_addr) : "ff:ff:ff:ff:ff:ff");
}

static ssize_t show_remote_mac(struct netconsole_target *nt, char *buf)
Expand Down

0 comments on commit 69c3683

Please sign in to comment.