summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorMatthias Kaehlcke <mka@chromium.org>2017-07-25 21:36:25 +0300
committerDavid S. Miller <davem@davemloft.net>2017-07-27 03:01:43 +0300
commit0c3a8f8b8fabff4f3ad2dd7b95ae0e90cdd1aebb (patch)
treed5977d97a9fed104cabe1c35086b3ad6c6afb125 /net
parentd94708a553022bf012fa95af10532a134eeb5a52 (diff)
downloadlinux-0c3a8f8b8fabff4f3ad2dd7b95ae0e90cdd1aebb.tar.xz
netpoll: Fix device name check in netpoll_setup()
Apparently netpoll_setup() assumes that netpoll.dev_name is a pointer when checking if the device name is set: if (np->dev_name) { ... However the field is a character array, therefore the condition always yields true. Check instead whether the first byte of the array has a non-zero value. Signed-off-by: Matthias Kaehlcke <mka@chromium.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/core/netpoll.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/netpoll.c b/net/core/netpoll.c
index 8357f164c660..912731bed7b7 100644
--- a/net/core/netpoll.c
+++ b/net/core/netpoll.c
@@ -666,7 +666,7 @@ int netpoll_setup(struct netpoll *np)
int err;
rtnl_lock();
- if (np->dev_name) {
+ if (np->dev_name[0]) {
struct net *net = current->nsproxy->net_ns;
ndev = __dev_get_by_name(net, np->dev_name);
}