net: genl: fix error path memory leak in policy dumping
Subsystems (2)
Jakub Kicinski
maintainerPATCH v2 1/1 net: genl: fix error path memory leak in policy dumping
If construction of the array of policies fails when recording non-first policy we need to unwind.
netlink_policy_dump_add_policy() itself also needs fixing as it currently gives up on error without recording the allocated pointer in the pstate pointer.
---
CC: [email protected]
--- net/netlink/genetlink.c | 6 +++++- net/netlink/policy.c | 14 ++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-)
net/netlink/genetlink.c +5 -1
@@ -1174,13 +1174,17 @@ static int ctrl_dumppolicy_start(struct netlink_callback *cb) op.policy, op.maxattr);if (err) -return err; + goto err_free_state; } }if (!ctx->state)return -ENODATA ;return 0 ; + +err_free_state: +netlink_policy_dump_free (ctx->state); +return err; } static void *ctrl_dumppolicy_prep(struct sk_buff *skb,
net/netlink/policy.c +12 -2
@@ -144,7 +144,7 @@ int netlink_policy_dump_add_policy(struct netlink_policy_dump_state **pstate, err =add_policy (&state, policy, maxtype);if (err) -return err; + goto err_try_undo; for (policy_idx = 0; policy_idx < state->n_alloc && state->policies[policy_idx].policy;
@@ -164,7 +164,7 @@ int netlink_policy_dump_add_policy(struct netlink_policy_dump_state **pstate, policy[type].nested_policy, policy[type].len);if (err) -return err; + goto err_try_undo;break ;default :break ;
@@ -174,6 +174,16 @@ int netlink_policy_dump_add_policy(struct netlink_policy_dump_state **pstate, *pstate = state;return 0 ; + +err_try_undo: +/* Try to preserve reasonable unwind semantics - if we're starting from +* scratch clean up fully, otherwise record what we got and caller will. +*/ +if (!*pstate) +netlink_policy_dump_free (state); +else + *pstate = state; +return err; } static bool
Signature · 1 line
2.37.2
This patch was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (master)
by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Tue, 16 Aug 2022 09:19:39 -0700 you wrote:
If construction of the array of policies fails when recording non-first policy we need to unwind.
netlink_policy_dump_add_policy()itself also needs fixing as it currently gives up on error without recording the allocated pointer in the pstate pointer.[...]
Here is the summary with links:
- [net,v2] net: genl: fix error path memory leak in policy dumping
https://git.kernel.org/netdev/net/c/249801360db3
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html