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

Commit d31ae952 authored by Sven Eckelmann's avatar Sven Eckelmann Committed by Greg Kroah-Hartman
Browse files

batman-adv: Ignore invalid batadv_v_gw during netlink send 



[ Upstream commit 011c935fceae5252619ef730baa610c655281dda ]

The function batadv_v_gw_dump stops the processing loop when
batadv_v_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: b71bb6f9 ("batman-adv: add B.A.T.M.A.N. V bat_gw_dump implementations")
Signed-off-by: default avatarSven Eckelmann <sven.eckelmann@openmesh.com>
Signed-off-by: default avatarSimon Wunderlich <sw@simonwunderlich.de>
Signed-off-by: default avatarSasha Levin <alexander.levin@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 280a7b6f

net/batman-adv/bat_v.c

+1 −1
Original line number Diff line number Diff line
@@ -920,7 +920,7 @@ static int batadv_v_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);