From: Md Haris Iqbal <haris.iqbal@ionos.com>
To: linux-rdma@vger.kernel.org
Cc: bvanassche@acm.org, leon@kernel.org, jgg@ziepe.ca,
haris.iqbal@ionos.com, jinpu.wang@ionos.com, linmq006@gmail.com,
Gioh Kim <gi-oh.kim@ionos.com>,
Santosh Kumar Pradhan <santosh.pradhan@ionos.com>
Subject: [PATCH v2] RDMA/rtrs-clt: Fix possible double free in error case
Date: Thu, 20 Jan 2022 18:36:32 +0100 [thread overview]
Message-ID: <20220120173632.420807-1-haris.iqbal@ionos.com> (raw)
Callback function rtrs_clt_dev_release() for put_device()
calls kfree(clt) to free memory. We shouldn't call kfree(clt) again,
and we can't use the clt after kfree too.
free clt->pcpu_path and clt explicitly when dev_set_name fails.
For other errors after that, let the release function take care of
freeing them. Also remove free_percpu(clt->pcpu_path) from free_clt()
Fixes: 6a98d71daea1 ("RDMA/rtrs: client: main functionality")
Reported-by: Miaoqian Lin <linmq006@gmail.com>
Signed-off-by: Md Haris Iqbal <haris.iqbal@ionos.com>
Reviewed-by: Gioh Kim <gi-oh.kim@ionos.com>
Reviewed-by: Santosh Kumar Pradhan <santosh.pradhan@ionos.com>
Reviewed-by: Jack Wang <jinpu.wang@ionos.com>
---
Changes since v1:
- Explicitly free clt->pcpu_path and clt when dev_set_name fails
- Remove free_percpu(clt->pcpu_path) from free_clt function
---
drivers/infiniband/ulp/rtrs/rtrs-clt.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/ulp/rtrs/rtrs-clt.c b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
index 7c3f98e57889..b8fc6ee4bb7f 100644
--- a/drivers/infiniband/ulp/rtrs/rtrs-clt.c
+++ b/drivers/infiniband/ulp/rtrs/rtrs-clt.c
@@ -2682,6 +2682,7 @@ static void rtrs_clt_dev_release(struct device *dev)
struct rtrs_clt_sess *clt = container_of(dev, struct rtrs_clt_sess,
dev);
+ free_percpu(clt->pcpu_path);
kfree(clt);
}
@@ -2731,8 +2732,11 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
clt->dev.class = rtrs_clt_dev_class;
clt->dev.release = rtrs_clt_dev_release;
err = dev_set_name(&clt->dev, "%s", sessname);
- if (err)
+ if (err) {
+ free_percpu(clt->pcpu_path);
+ kfree(clt);
goto err;
+ }
/*
* Suppress user space notification until
* sysfs files are created
@@ -2762,18 +2766,17 @@ static struct rtrs_clt_sess *alloc_clt(const char *sessname, size_t paths_num,
err_dev:
device_unregister(&clt->dev);
err:
- free_percpu(clt->pcpu_path);
- kfree(clt);
return ERR_PTR(err);
}
static void free_clt(struct rtrs_clt_sess *clt)
{
free_permits(clt);
- free_percpu(clt->pcpu_path);
mutex_destroy(&clt->paths_ev_mutex);
mutex_destroy(&clt->paths_mutex);
- /* release callback will free clt in last put */
+ /*
+ * release callback will free clt->pcpu_path and clt in last put
+ */
device_unregister(&clt->dev);
}
--
2.25.1
next reply other threads:[~2022-01-20 17:36 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-20 17:36 Md Haris Iqbal [this message]
2022-01-23 10:56 ` [PATCH v2] RDMA/rtrs-clt: Fix possible double free in error case Leon Romanovsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220120173632.420807-1-haris.iqbal@ionos.com \
--to=haris.iqbal@ionos.com \
--cc=bvanassche@acm.org \
--cc=gi-oh.kim@ionos.com \
--cc=jgg@ziepe.ca \
--cc=jinpu.wang@ionos.com \
--cc=leon@kernel.org \
--cc=linmq006@gmail.com \
--cc=linux-rdma@vger.kernel.org \
--cc=santosh.pradhan@ionos.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox