batman-adv: Ignore invalid batadv_iv_gw during netlink send
PATCH 1/2 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.
--- net/batman-adv/bat_iv_ogm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/bat_iv_ogm.c +1 -1
@@ -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 );
Signature · 1 line
2.11.0
PATCH 2/2 batman-adv: Ignore invalid batadv_v_gw during netlink send
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.
--- net/batman-adv/bat_v.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/batman-adv/bat_v.c +1 -1
@@ -929,7 +929,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 );
Signature · 1 line
2.11.0
Simon Wunderlich
maintainerQuoted 10 lines · CET Sven Eckelmann
The function
batadv_iv_gw_dumpstops the processing loop whenbatadv_iv_gw_dump_entryreturns a non-0 return code. This should only happen when the buffer is full. Otherwise, an empty message may be returned bybatadv_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_dumpimplementations") Signed-off-by: Sven Eckelmann
<[email protected]>
I've applied both patches in this series in c58f37c2 and 12f1d3a6.
Thank you!
Simon