summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeiichi KII <k-keiichi@bx.jp.nec.com>2008-02-15 02:01:58 -0800
committerDavid S. Miller <davem@davemloft.net>2008-02-15 02:01:58 -0800
commit69c3683ca7fe066ecba9e8a0424c5abd258a5d58 (patch)
tree885d2e9eca411c70d600623b2bfb9526304f1320
parentb5c15fc004ac83b7ad280acbe0fd4bbed7e2c8d4 (diff)
downloadop-kernel-dev-69c3683ca7fe066ecba9e8a0424c5abd258a5d58.zip
op-kernel-dev-69c3683ca7fe066ecba9e8a0424c5abd258a5d58.tar.gz
netconsole: avoid null pointer dereference at show_local_mac()
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>
-rw-r--r--drivers/net/netconsole.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/netconsole.c b/drivers/net/netconsole.c
index 31e047d..501e451 100644
--- a/drivers/net/netconsole.c
+++ b/drivers/net/netconsole.c
@@ -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)
OpenPOWER on IntegriCloud