From: Abel Vesa <abel.vesa@linaro.org>
To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Amol Maheshwari <amahesh@qti.qualcomm.com>,
Andy Gross <agross@kernel.org>,
Bjorn Andersson <andersson@kernel.org>,
Konrad Dybcio <konrad.dybcio@somainline.org>,
Rob Herring <robh@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>,
Ekansh Gupta <ekangupt@qti.qualcomm.com>,
Bharath Kumar <bkumar@qti.qualcomm.com>,
Himateja Reddy <hmreddy@quicinc.com>,
Anirudh Raghavendra <araghave@quicinc.com>
Cc: Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-arm-msm@vger.kernel.org,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
devicetree@vger.kernel.org
Subject: [PATCH v3 05/10] misc: fastrpc: Use fastrpc_map_put in fastrpc_map_create on fail
Date: Fri, 9 Sep 2022 16:39:33 +0300 [thread overview]
Message-ID: <20220909133938.3518520-6-abel.vesa@linaro.org> (raw)
In-Reply-To: <20220909133938.3518520-1-abel.vesa@linaro.org>
Move the kref_init right after the allocation so that we can use
fastrpc_map_put on any following error case.
Signed-off-by: Abel Vesa <abel.vesa@linaro.org>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
---
Changes since v2:
* added Srinivas's R-b tag
drivers/misc/fastrpc.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index d421e3e473d6..8bc9cf5305c4 100644
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -745,6 +745,8 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd,
return -ENOMEM;
INIT_LIST_HEAD(&map->node);
+ kref_init(&map->refcount);
+
map->fl = fl;
map->fd = fd;
map->buf = dma_buf_get(fd);
@@ -771,7 +773,6 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd,
map->size = len;
map->va = sg_virt(map->table->sgl);
map->len = len;
- kref_init(&map->refcount);
if (attr & FASTRPC_ATTR_SECUREMAP) {
/*
@@ -801,7 +802,7 @@ static int fastrpc_map_create(struct fastrpc_user *fl, int fd,
attach_err:
dma_buf_put(map->buf);
get_err:
- kfree(map);
+ fastrpc_map_put(map);
return err;
}
--
2.34.1
next prev parent reply other threads:[~2022-09-09 13:41 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-09 13:39 [PATCH v3 00/10] misc: fastrpc: Add audiopd support Abel Vesa
2022-09-09 13:39 ` [PATCH v3 01/10] misc: fastrpc: Rename audio protection domain to root Abel Vesa
2022-09-09 13:39 ` [PATCH v3 02/10] misc: fastrpc: Add reserved mem support Abel Vesa
2022-09-09 13:39 ` [PATCH v3 03/10] dt-bindings: misc: fastrpc: Document memory-region property Abel Vesa
2022-09-09 14:44 ` Krzysztof Kozlowski
2022-09-12 17:10 ` Rob Herring
2022-09-09 13:39 ` [PATCH v3 04/10] misc: fastrpc: Add fastrpc_remote_heap_alloc Abel Vesa
2022-09-09 13:39 ` Abel Vesa [this message]
2022-09-09 13:39 ` [PATCH v3 06/10] misc: fastrpc: Rework fastrpc_req_munmap Abel Vesa
2022-09-09 13:39 ` [PATCH v3 07/10] misc: fastrpc: Add support for audiopd Abel Vesa
2022-09-09 13:39 ` [PATCH v3 08/10] misc: fastrpc: Safekeep mmaps on interrupted invoke Abel Vesa
2022-09-16 12:58 ` Srinivas Kandagatla
2022-09-16 14:38 ` Abel Vesa
2022-09-09 13:39 ` [PATCH v3 09/10] misc: fastrpc: Add mmap request assigning for static PD pool Abel Vesa
2022-09-09 13:39 ` [PATCH v3 10/10] misc: fastrpc: Add dma_mask to fastrpc_channel_ctx Abel Vesa
2022-09-12 17:08 ` [PATCH v3 00/10] misc: fastrpc: Add audiopd support Rob Herring
2022-09-13 8:53 ` Abel Vesa
2022-09-16 12:56 ` Srinivas Kandagatla
2022-11-24 11:07 ` Srinivas Kandagatla
2022-11-24 16:46 ` Greg KH
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=20220909133938.3518520-6-abel.vesa@linaro.org \
--to=abel.vesa@linaro.org \
--cc=agross@kernel.org \
--cc=amahesh@qti.qualcomm.com \
--cc=andersson@kernel.org \
--cc=araghave@quicinc.com \
--cc=arnd@arndb.de \
--cc=bkumar@qti.qualcomm.com \
--cc=devicetree@vger.kernel.org \
--cc=ekangupt@qti.qualcomm.com \
--cc=gregkh@linuxfoundation.org \
--cc=hmreddy@quicinc.com \
--cc=konrad.dybcio@somainline.org \
--cc=krzysztof.kozlowski@linaro.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robh@kernel.org \
--cc=srinivas.kandagatla@linaro.org \
/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;
as well as URLs for NNTP newsgroup(s).