Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6ed5498 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

batman: fix a bogus warning from batadv_is_on_batman_iface() 



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: default avatarJet Chen <jet.chen@intel.com>
Tested-by: default avatarJet 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: default avatarCong Wang <xiyou.wangcong@gmail.com>
Signed-off-by: default avatarCong Wang <cwang@twopensource.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fbdc0ad0

net/batman-adv/hard-interface.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */