diff options
| author | Cong Wang <cwang@twopensource.com> | 2014-05-22 11:57:17 -0700 |
|---|---|---|
| committer | Tim Wang <wangtt@marvell.com> | 2014-12-15 21:32:19 +0800 |
| commit | 6ee1f9edced3b96bee6130532797d333ddf37284 (patch) | |
| tree | 7a894d23daa1393d61be984aa6f405b06420ab8d /net | |
| parent | d9feeafe6b21e019ac7504e52171f3e9df1cee2d (diff) | |
| download | pxa-v3.14-6ee1f9edced3b96bee6130532797d333ddf37284.tar.gz | |
batman: fix a bogus warning from batadv_is_on_batman_iface()
commit b6ed5498601df40489606dbc14a9c7011c16630b upstream.
batman tries to search dev->iflink to check if it's a batman interface,
but ->iflink could be 0, which is not a valid ifindex. It should just
avoid iflink == 0 case.
Reported-by: Jet Chen <jet.chen@intel.com>
Tested-by: Jet Chen <jet.chen@intel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Steffen Klassert <steffen.klassert@secunet.com>
Cc: Antonio Quartulli <antonio@open-mesh.com>
Cc: Marek Lindner <mareklindner@neomailbox.ch>
Signed-off-by: Cong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: Cong Wang <cwang@twopensource.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
| -rw-r--r-- | net/batman-adv/hard-interface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c index b851cc58085..fbda6b54baf 100644 --- a/net/batman-adv/hard-interface.c +++ b/net/batman-adv/hard-interface.c @@ -83,7 +83,7 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev) return true; /* no more parents..stop recursion */ - if (net_dev->iflink == net_dev->ifindex) + if (net_dev->iflink == 0 || net_dev->iflink == net_dev->ifindex) return false; /* recurse over the parent device */ |