genetlink: fix single op policy dump when do is present
Subsystems (2)
Jakub Kicinski
maintainerPATCH v2 1/1 genetlink: fix single op policy dump when do is present
Jonathan reports crashes when running net-next in Meta's fleet. Stats collection uses ethtool -I which does a per-op policy dump to check if stats are supported. We don't initialize the dumpit information if doit succeeds due to evaluation short-circuiting.
The crash may look like this:
BUG: kernel NULL pointer dereference, address: 0000000000000cc0
RIP: 0010:netlink_policy_dump_add_policy+0x174/0x2a0
ctrl_dumppolicy_start+0x19f/0x2f0
genl_start+0xe7/0x140Or we may trigger a warning:
WARNING: CPU: 1 PID: 785 at net/netlink/policy.c:87 netlink_policy_dump_get_policy_idx+0x79/0x80
RIP: 0010:netlink_policy_dump_get_policy_idx+0x79/0x80
ctrl_dumppolicy_put_op+0x214/0x360depending on what garbage we pick up from the stack.
---
CC: [email protected]
CC: [email protected]
v2:
- add a helper instead of doing magic sums
- improve title
v1: https://lore.kernel.org/all/[email protected]/
--- net/netlink/genetlink.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
net/netlink/genetlink.c +21 -9
@@ -282,6 +282,7 @@ genl_cmd_full_to_split(struct genl_split_ops *op,return 0 ; } +/* Must make sure that op is initialized to 0 on failure */ static int genl_get_cmd (u32 cmd,u8 flags,const struct genl_family *family,struct genl_split_ops *op)
@@ -302,6 +303,21 @@ genl_get_cmd(u32 cmd, u8 flags, const struct genl_family *family,return err; } +/* For policy dumping only, get ops of both do and dump. +* Fail if both are missing, genl_get_cmd() will zero-init in case of failure. +*/ +static int +genl_get_cmd_both (u32 cmd,const struct genl_family *family, +struct genl_split_ops *doit,struct genl_split_ops *dumpit) +{ +int err1, err2; + + err1 =genl_get_cmd (cmd,GENL_CMD_CAP_DO , family, doit); + err2 =genl_get_cmd (cmd,GENL_CMD_CAP_DUMP , family, dumpit); + +return err1 && err2 ? -ENOENT :0 ; +} +static bool genl_op_iter_init (const struct genl_family *family,struct genl_op_iter *iter) {
@@ -1406,10 +1422,10 @@ static int ctrl_dumppolicy_start(struct netlink_callback *cb) ctx->single_op = true; ctx->op =nla_get_u32 (tb[CTRL_ATTR_OP ]); -if (genl_get_cmd (ctx->op,GENL_CMD_CAP_DO , rt, &doit) && -genl_get_cmd (ctx->op,GENL_CMD_CAP_DUMP , rt, &dump)) { + err =genl_get_cmd_both (ctx->op, rt, &doit, &dump); +if (err) {NL_SET_BAD_ATTR (cb->extack, tb[CTRL_ATTR_OP ]); -return -ENOENT ; +return err; }if (doit.policy) {
@@ -1551,13 +1567,9 @@ static int ctrl_dumppolicy(struct sk_buff *skb, struct netlink_callback *cb)if (ctx->single_op) {struct genl_split_ops doit, dumpit; -if (genl_get_cmd (ctx->op,GENL_CMD_CAP_DO , - ctx->rt, &doit) && -genl_get_cmd (ctx->op,GENL_CMD_CAP_DUMP , - ctx->rt, &dumpit)) { -WARN_ON (1 ); +if (WARN_ON (genl_get_cmd_both (ctx->op, ctx->rt, + &doit, &dumpit)))return -ENOENT ; - }if (ctrl_dumppolicy_put_op (skb, cb, &doit, &dumpit))return skb->len;
Signature · 1 line
2.38.1
Quoted 24 lines
-----Original Message-----
From: Jakub Kicinski <[email protected]>
Sent: Wednesday, November 9, 2022 10:33 AM
To: [email protected]
Cc: [email protected]; [email protected]; [email protected]; Jakub Kicinski <[email protected]>; Jonathan Lemon <[email protected]>; Keller, Jacob E <[email protected]>; [email protected]
Subject: [PATCH net-next v2] genetlink: fix single op policy dump when do is presentJonathan reports crashes when running net-next in Meta's fleet. Stats collection uses ethtool -I which does a per-op policy dump to check if stats are supported. We don't initialize the dumpit information if doit succeeds due to evaluation short-circuiting.
The crash may look like this:
BUG: kernel NULL pointer dereference, address: 0000000000000cc0 RIP: 0010:netlink_policy_dump_add_policy+0x174/0x2a0 ctrl_dumppolicy_start+0x19f/0x2f0 genl_start+0xe7/0x140
Quoted 9 lines
Or we may trigger a warning:
WARNING: CPU: 1 PID: 785 at net/netlink/policy.c:87 netlink_policy_dump_get_policy_idx+0x79/0x80 RIP: 0010:netlink_policy_dump_get_policy_idx+0x79/0x80 ctrl_dumppolicy_put_op+0x214/0x360depending on what garbage we pick up from the stack.
Thanks!
Quoted 85 lines
Reported-by Jonathan Lemon <[email protected]>Fixes 26588edbef60 ("genetlink: support split policies in
ctrl_dumppolicy_put_op()")Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]
CC: [email protected]v2:
- add a helper instead of doing magic sums
- improve title
v1: https://lore.kernel.org/all/[email protected]/--- net/netlink/genetlink.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)net/netlink/genetlink.c +16
-0@@ -282,6 +282,7 @@ genl_cmd_full_to_split(struct genl_split_ops *op,return 0 ; } +/* Must make sure that op is initialized to 0 on failure */ static int genl_get_cmd (u32 cmd,u8 flags,const struct genl_family *family,struct genl_split_ops *op)@@ -302,6 +303,21 @@ genl_get_cmd(u32 cmd, u8 flags, const structgenl_family *family, return err; } +/* For policy dumping only, get ops of both do and dump. +* Fail if both are missing, genl_get_cmd() will zero-init in case of failure. +*/ +static int +genl_get_cmd_both (u32 cmd,const struct genl_family *family, +struct genl_split_ops *doit,struct genl_split_ops *dumpit) +{ +int err1, err2; + + err1 =genl_get_cmd (cmd,GENL_CMD_CAP_DO , family, doit); + err2 =genl_get_cmd (cmd,GENL_CMD_CAP_DUMP , family, dumpit); + +return err1 && err2 ? -ENOENT :0 ; +} +static bool genl_op_iter_init (const struct genl_family *family,struct genl_op_iter *iter){
net/netlink/genetlink.c +3
-3@@ -1406,10 +1422,10 @@ static int ctrl_dumppolicy_start(struct netlink_callback *cb) ctx->single_op = true; ctx->op =nla_get_u32 (tb[CTRL_ATTR_OP ]); -if (genl_get_cmd (ctx->op,GENL_CMD_CAP_DO , rt, &doit) && -genl_get_cmd (ctx->op,GENL_CMD_CAP_DUMP , rt, &dump)) { + err =genl_get_cmd_both (ctx->op, rt, &doit, &dump); +if (err) {NL_SET_BAD_ATTR (cb->extack, tb[CTRL_ATTR_OP ]); -return -ENOENT ; +return err; }net/netlink/genetlink.c +2
-6if (doit.policy) {@@ -1551,13 +1567,9 @@ static int ctrl_dumppolicy(struct sk_buff *skb, struct netlink_callback *cb)if (ctx->single_op) {struct genl_split_ops doit, dumpit; -if (genl_get_cmd (ctx->op,GENL_CMD_CAP_DO , - ctx->rt, &doit) && -genl_get_cmd (ctx->op,GENL_CMD_CAP_DUMP , - ctx->rt, &dumpit)) { -WARN_ON (1 ); +if (WARN_ON (genl_get_cmd_both (ctx->op, ctx->rt, + &doit, &dumpit)))return -ENOENT ; - }if (ctrl_dumppolicy_put_op (skb, cb, &doit, &dumpit))return
skb->len;
--
2.38.1
Quoted 27 lines · Jakub Kicinski
Jonathan reports crashes when running net-next in Meta's fleet. Stats collection uses ethtool -I which does a per-op policy dump to check if stats are supported. We don't initialize the dumpit information if doit succeeds due to evaluation short-circuiting.
The crash may look like this:
BUG: kernel NULL pointer dereference, address: 0000000000000cc0 RIP: 0010:netlink_policy_dump_add_policy+0x174/0x2a0 ctrl_dumppolicy_start+0x19f/0x2f0 genl_start+0xe7/0x140Or we may trigger a warning:
WARNING: CPU: 1 PID: 785 at net/netlink/policy.c:87 netlink_policy_dump_get_policy_idx+0x79/0x80 RIP: 0010:netlink_policy_dump_get_policy_idx+0x79/0x80 ctrl_dumppolicy_put_op+0x214/0x360depending on what garbage we pick up from the stack.
Reported-by Jonathan Lemon <[email protected]>Fixes 26588edbef60 ("genetlink: support split policies in ctrl_dumppolicy_put_op()")Signed-off-by Jakub Kicinski <[email protected]>---
CC: [email protected]
CC: [email protected]
Quoted 8 lines
v2:
- add a helper instead of doing magic sums
- improve title
v1: https://lore.kernel.org/all/[email protected]/--- net/netlink/genetlink.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-)
Thanks,
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (master) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Wed, 9 Nov 2022 10:32:54 -0800 you wrote:
Jonathan reports crashes when running net-next in Meta's fleet. Stats collection uses ethtool -I which does a per-op policy dump to check if stats are supported. We don't initialize the dumpit information if doit succeeds due to evaluation short-circuiting.
The crash may look like this:
[...]
Here is the summary with links:
- [net-next,v2] genetlink: fix single op policy dump when do is present
https://git.kernel.org/netdev/net-next/c/c1b05105573b
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html