Skip to contentSkip to conversation

net: add RTNL_FLAG_DUMP_SPLIT_NLM_DONE to RTM_GET(RULE|ROUTE)

PATCH New Maciej Żenczykowski 1 participant 1 message Jun 13, 2024

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: add RTNL_FLAG_DUMP_SPLIT_NLM_DONE to RTM_GET(RULE|ROUTE)

without this Android's net test, available at:
https://cs.android.com/android/platform/superproject/main/+/main:kernel/tests/net/test/
run via:
/...aosp-tests.../net/test/run_net_test.sh --builder multinetwork_test.py
fails with:
TypeError: NLMsgHdr requires a bytes object of length 16, got 4

Fixes 3e41af90767d ("rtnetlink: use xarray iterator to implement rtnl_dump_ifinfo()")
Fixes cdb2f80f1c10 ("inet: use xa_array iterator to implement inet_dump_ifaddr()")
Cc Jakub Kicinski <[email protected]>
Cc Eric Dumazet <[email protected]>
Cc David S. Miller <[email protected]>
---
 net/core/fib_rules.c | 2 +-
 net/ipv6/route.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
net/core/fib_rules.c +1 -1
index 6ebffbc63236..6229a8947889 100644
@@ -1294,7 +1294,7 @@ static int __init fib_rules_init(void)
 	rtnl_register(PF_UNSPEC, RTM_NEWRULE, fib_nl_newrule, NULL, 0);
 	rtnl_register(PF_UNSPEC, RTM_DELRULE, fib_nl_delrule, NULL, 0);
 	rtnl_register(PF_UNSPEC, RTM_GETRULE, NULL, fib_nl_dumprule,
-		      RTNL_FLAG_DUMP_UNLOCKED);
+		      RTNL_FLAG_DUMP_UNLOCKED | RTNL_FLAG_DUMP_SPLIT_NLM_DONE);
 
 	err = register_pernet_subsys(&fib_rules_net_ops);
 	if (err < 0)
net/ipv6/route.c +1 -1
index f083d9faba6b..1558687c2894 100644
@@ -6736,7 +6736,7 @@ int __init ip6_route_init(void)
 
 	ret = rtnl_register_module(THIS_MODULE, PF_INET6, RTM_GETROUTE,
 				   inet6_rtm_getroute, NULL,
-				   RTNL_FLAG_DOIT_UNLOCKED);
+				   RTNL_FLAG_DOIT_UNLOCKED | RTNL_FLAG_DUMP_SPLIT_NLM_DONE);
 	if (ret < 0)
 		goto out_register_late_subsys;
 
Signature · 1 line
2.45.2.505.gda0bf45e8d-goog