Commit 940c620d authored Sep 27, 2018 by Colin Ian King Committed by Bjorn Andersson Sep 27, 2018

rpmsg: smd: fix memory leak on channel create



Currently a failed allocation of channel->name leads to an
immediate return without freeing channel. Fix this by setting
ret to -ENOMEM and jumping to an exit path that kfree's channel.

Detected by CoverityScan, CID#1473692 ("Resource Leak")

Fixes: 53e2822e ("rpmsg: Introduce Qualcomm SMD backend")
Cc: stable@vger.kernel.org
Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>

parent f0beb4ba

drivers/rpmsg/qcom_smd.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1122,8 +1122,10 @@ static struct qcom_smd_channel qcom_smd_create_channel(struct qcom_smd_edge ed

		channel->edge = edge;
		channel->name = kstrdup(name, GFP_KERNEL);
		if (!channel->name)
		return ERR_PTR(-ENOMEM);
		if (!channel->name) {
		ret = -ENOMEM;
		goto free_channel;
		}

		spin_lock_init(&channel->tx_lock);
		spin_lock_init(&channel->recv_lock);
		@@ -1173,6 +1175,7 @@ static struct qcom_smd_channel qcom_smd_create_channel(struct qcom_smd_edge ed

		free_name_and_channel:
		kfree(channel->name);
		free_channel:
		kfree(channel);

		return ERR_PTR(ret);

Admin message