[PATCH net] caif: fix memory leak in cfctrl_linkup_request()

[PATCH net] caif: fix memory leak in cfctrl_linkup_request()

[Zhengchao Shao]

When linktype is unknown or kzalloc failed in cfctrl_linkup_request(),
pkt is not released. Add release process to error path.

Fixes: b482cd2053e3 ("net-caif: add CAIF core protocol stack")
Fixes: 8d545c8f958f ("caif: Disconnect without waiting for response")
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
---
 net/caif/cfctrl.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/net/caif/cfctrl.c b/net/caif/cfctrl.c
index cc405d8c7c30..8480684f2762 100644
--- a/net/caif/cfctrl.c
+++ b/net/caif/cfctrl.c
@@ -269,11 +269,15 @@ int cfctrl_linkup_request(struct cflayer *layer,
 	default:
 		pr_warn("Request setup of bad link type = %d\n",
 			param->linktype);
+		cfpkt_destroy(pkt);
 		return -EINVAL;
 	}
 	req = kzalloc(sizeof(*req), GFP_KERNEL);
-	if (!req)
+	if (!req) {
+		cfpkt_destroy(pkt);
 		return -ENOMEM;
+	}
+
 	req->client_layer = user_layer;
 	req->cmd = CFCTRL_CMD_LINK_SETUP;
 	req->param = *param;
-- 
2.34.1

Re: [PATCH net] caif: fix memory leak in cfctrl_linkup_request()

[Jiri Pirko]

Wed, Jan 04, 2023 at 07:51:46AM CET, shaozhengchao@huawei.com wrote:
>When linktype is unknown or kzalloc failed in cfctrl_linkup_request(),
>pkt is not released. Add release process to error path.
>
>Fixes: b482cd2053e3 ("net-caif: add CAIF core protocol stack")
>Fixes: 8d545c8f958f ("caif: Disconnect without waiting for response")
>Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>

Reviewed-by: Jiri Pirko <jiri@nvidia.com>

Re: [PATCH net] caif: fix memory leak in cfctrl_linkup_request()

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net.git (master)
by Paolo Abeni <pabeni@redhat.com>:

On Wed, 4 Jan 2023 14:51:46 +0800 you wrote:
> When linktype is unknown or kzalloc failed in cfctrl_linkup_request(),
> pkt is not released. Add release process to error path.
> 
> Fixes: b482cd2053e3 ("net-caif: add CAIF core protocol stack")
> Fixes: 8d545c8f958f ("caif: Disconnect without waiting for response")
> Signed-off-by: Zhengchao Shao <shaozhengchao@huawei.com>
> 
> [...]

Here is the summary with links:
  - [net] caif: fix memory leak in cfctrl_linkup_request()
    https://git.kernel.org/netdev/net/c/fe69230f0589

You are awesome, thank you!
-- 
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html