* [Patch net] batman: fix a bogus warning from batadv_is_on_batman_iface()
@ 2014-05-22 18:57 Cong Wang
2014-05-22 21:23 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Cong Wang @ 2014-05-22 18:57 UTC (permalink / raw)
To: netdev
Cc: jet.chen, David S. Miller, Steffen Klassert, Antonio Quartulli,
Marek Lindner, Cong Wang, Cong Wang
From: Cong Wang <cwang@twopensource.com>
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>
---
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
index b851cc5..fbda6b5 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 */
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Patch net] batman: fix a bogus warning from batadv_is_on_batman_iface()
2014-05-22 18:57 [Patch net] batman: fix a bogus warning from batadv_is_on_batman_iface() Cong Wang
@ 2014-05-22 21:23 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2014-05-22 21:23 UTC (permalink / raw)
To: xiyou.wangcong
Cc: netdev, jet.chen, steffen.klassert, antonio, mareklindner, cwang
From: Cong Wang <xiyou.wangcong@gmail.com>
Date: Thu, 22 May 2014 11:57:17 -0700
> From: Cong Wang <cwang@twopensource.com>
>
> 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>
Applied, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-22 21:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-05-22 18:57 [Patch net] batman: fix a bogus warning from batadv_is_on_batman_iface() Cong Wang
2014-05-22 21:23 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).