From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Thu, 27 Sep 2018 20:12:26 -0700 From: Bjorn Andersson Subject: Re: [PATCH] rpmsg: fix memory leak on channel Message-ID: <20180928031226.GB29702@builder> References: <20180927213627.12752-1-colin.king@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180927213627.12752-1-colin.king@canonical.com> To: Colin King Cc: Ohad Ben-Cohen , linux-remoteproc@vger.kernel.org, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: On Thu 27 Sep 14:36 PDT 2018, Colin King wrote: > From: Colin Ian King > > 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: 53e2822e56c7 ("rpmsg: Introduce Qualcomm SMD backend") > Signed-off-by: Colin Ian King Added Cc: stable and applied. Thanks, Bjorn > --- > drivers/rpmsg/qcom_smd.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/rpmsg/qcom_smd.c b/drivers/rpmsg/qcom_smd.c > index 0dae7c9f4a8f..4abbeea782fa 100644 > --- a/drivers/rpmsg/qcom_smd.c > +++ b/drivers/rpmsg/qcom_smd.c > @@ -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); > -- > 2.17.1 >