[<prev] [next>] [day] [month] [year] [list]
Message-ID: <20240613141240.2122771-1-maze@google.com>
Date: Thu, 13 Jun 2024 07:12:40 -0700
From: "Maciej Żenczykowski" <maze@...gle.com>
To: "Maciej Żenczykowski" <zenczykowski@...il.com>
Cc: Linux Network Development Mailing List <netdev@...r.kernel.org>, "David S . Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>, Jakub Kicinski <kuba@...nel.org>, Paolo Abeni <pabeni@...hat.com>,
"Maciej Żenczykowski" <maze@...gle.com>
Subject: [PATCH net] 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 <kuba@...nel.org>
Cc: Eric Dumazet <edumazet@...gle.com>
Cc: David S. Miller <davem@...emloft.net>
Signed-off-by: Maciej Żenczykowski <maze@...gle.com>
---
net/core/fib_rules.c | 2 +-
net/ipv6/route.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
index 6ebffbc63236..6229a8947889 100644
--- a/net/core/fib_rules.c
+++ b/net/core/fib_rules.c
@@ -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)
diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index f083d9faba6b..1558687c2894 100644
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -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;
--
2.45.2.505.gda0bf45e8d-goog
Powered by blists - more mailing lists