| From b6ed5498601df40489606dbc14a9c7011c16630b Mon Sep 17 00:00:00 2001 |
| From: Cong Wang <cwang@twopensource.com> |
| Date: Thu, 22 May 2014 11:57:17 -0700 |
| Subject: batman: fix a bogus warning from batadv_is_on_batman_iface() |
| |
| From: Cong Wang <cwang@twopensource.com> |
| |
| 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> |
| |
| --- |
| net/batman-adv/hard-interface.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- 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(co |
| 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 */ |
