This is a note to let you know that I've just added the patch titled
batman: fix a bogus warning from batadv_is_on_batman_iface()
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
batman-fix-a-bogus-warning-from-batadv_is_on_batman_iface.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <[email protected]> know about it.
>From b6ed5498601df40489606dbc14a9c7011c16630b Mon Sep 17 00:00:00 2001
From: Cong Wang <[email protected]>
Date: Thu, 22 May 2014 11:57:17 -0700
Subject: batman: fix a bogus warning from batadv_is_on_batman_iface()
From: Cong Wang <[email protected]>
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 <[email protected]>
Tested-by: Jet Chen <[email protected]>
Cc: David S. Miller <[email protected]>
Cc: Steffen Klassert <[email protected]>
Cc: Antonio Quartulli <[email protected]>
Cc: Marek Lindner <[email protected]>
Signed-off-by: Cong Wang <[email protected]>
Signed-off-by: Cong Wang <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
---
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 */
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/batman-fix-a-bogus-warning-from-batadv_is_on_batman_iface.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
