mirror of
https://git.openwrt.org/feed/routing.git
synced 2024-06-15 11:43:55 +02:00
02313085ea
* Avoid WARN on net_device without parent in netns * Force mac header to start of data on xmit Signed-off-by: Sven Eckelmann <sven@narfation.org>
49 lines
2.0 KiB
Diff
49 lines
2.0 KiB
Diff
From: Sven Eckelmann <sven@narfation.org>
|
|
Date: Sun, 30 Dec 2018 12:46:01 +0100
|
|
Subject: [PATCH] batman-adv: Avoid WARN on net_device without parent in netns
|
|
|
|
It is not allowed to use WARN* helpers on potential incorrect input from
|
|
the user or transient problems because systems configured as panic_on_warn
|
|
will reboot due to such a problem.
|
|
|
|
A NULL return value of __dev_get_by_index can be caused by various problems
|
|
which can either be related to the system configuration or problems
|
|
(incorrectly returned network namespaces) in other (virtual) net_device
|
|
drivers. batman-adv should not cause a (harmful) WARN in this situation and
|
|
instead only report it via a simple message.
|
|
|
|
Fixes: 3d48811b27f5 ("batman-adv: prevent using any virtual device created on batman-adv as hard-interface")
|
|
Reported-by: syzbot+c764de0fcfadca9a8595@syzkaller.appspotmail.com
|
|
Reported-by: Dmitry Vyukov <dvyukov@google.com>
|
|
Signed-off-by: Sven Eckelmann <sven@narfation.org>
|
|
|
|
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/59ad04405be86f648fd83d81d2fd0a78f215a43b
|
|
---
|
|
net/batman-adv/hard-interface.c | 5 +++--
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/net/batman-adv/hard-interface.c b/net/batman-adv/hard-interface.c
|
|
index 2f0d42f2f913e74cf10c0c6ce89320434994cac5..08690d06b7be2b25ca3f009394763c7083c70644 100644
|
|
--- a/net/batman-adv/hard-interface.c
|
|
+++ b/net/batman-adv/hard-interface.c
|
|
@@ -20,7 +20,6 @@
|
|
#include "main.h"
|
|
|
|
#include <linux/atomic.h>
|
|
-#include <linux/bug.h>
|
|
#include <linux/byteorder/generic.h>
|
|
#include <linux/errno.h>
|
|
#include <linux/gfp.h>
|
|
@@ -179,8 +178,10 @@ static bool batadv_is_on_batman_iface(const struct net_device *net_dev)
|
|
parent_dev = __dev_get_by_index((struct net *)parent_net,
|
|
dev_get_iflink(net_dev));
|
|
/* if we got a NULL parent_dev there is something broken.. */
|
|
- if (WARN(!parent_dev, "Cannot find parent device"))
|
|
+ if (!parent_dev) {
|
|
+ pr_err("Cannot find parent device\n");
|
|
return false;
|
|
+ }
|
|
|
|
if (batadv_mutual_parents(net_dev, net, parent_dev, parent_net))
|
|
return false;
|