30 lines
1.4 KiB
Diff
30 lines
1.4 KiB
Diff
From: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|
Date: Mon, 19 Feb 2018 14:08:52 +0100
|
|
Subject: batman-adv: Ignore invalid batadv_iv_gw during netlink send
|
|
|
|
The function batadv_iv_gw_dump stops the processing loop when
|
|
batadv_iv_gw_dump_entry returns a non-0 return code. This should only
|
|
happen when the buffer is full. Otherwise, an empty message may be
|
|
returned by batadv_gw_dump. This empty message will then stop the netlink
|
|
dumping of gateway entries. At worst, not a single entry is returned to
|
|
userspace even when plenty of possible gateways exist.
|
|
|
|
Fixes: fa3228924152 ("batman-adv: add B.A.T.M.A.N. IV bat_gw_dump implementations")
|
|
Signed-off-by: Sven Eckelmann <sven.eckelmann@openmesh.com>
|
|
Signed-off-by: Simon Wunderlich <sw@simonwunderlich.de>
|
|
|
|
Origin: upstream, https://git.open-mesh.org/batman-adv.git/commit/c58f37c248bb4926cda82fd0463b6fecb3d3654f
|
|
|
|
diff --git a/net/batman-adv/bat_iv_ogm.c b/net/batman-adv/bat_iv_ogm.c
|
|
index 56b4984d738e87098c24213d4aa277a2ef948fec..1847898906d495980a71eb6a0e5a7b510e55d003 100644
|
|
--- a/net/batman-adv/bat_iv_ogm.c
|
|
+++ b/net/batman-adv/bat_iv_ogm.c
|
|
@@ -2719,7 +2719,7 @@ static int batadv_iv_gw_dump_entry(struct sk_buff *msg, u32 portid, u32 seq,
|
|
struct batadv_neigh_ifinfo *router_ifinfo = NULL;
|
|
struct batadv_neigh_node *router;
|
|
struct batadv_gw_node *curr_gw;
|
|
- int ret = -EINVAL;
|
|
+ int ret = 0;
|
|
void *hdr;
|
|
|
|
router = batadv_orig_router_get(gw_node->orig_node, BATADV_IF_DEFAULT);
|