From: Sukrut Bellary <sukrut.bellary@linux.com>
To: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Amol Maheshwari <amahesh@qti.qualcomm.com>,
Arnd Bergmann <arnd@arndb.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: Sukrut Bellary <sukrut.bellary@linux.com>,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
kernel-janitors@vger.kernel.org,
Shuah Khan <skhan@linuxfoundation.org>
Subject: [PATCH] misc: fastrpc: Fix double free of 'buf' in error path
Date: Thu, 18 May 2023 03:08:29 -0700 [thread overview]
Message-ID: <20230518100829.515143-1-sukrut.bellary@linux.com> (raw)
smatch warning:
drivers/misc/fastrpc.c:1926 fastrpc_req_mmap() error: double free of 'buf'
In fastrpc_req_mmap() error path, the fastrpc buffer is freed in
fastrpc_req_munmap_impl() if unmap is successful.
But in the end, there is an unconditional call to fastrpc_buf_free().
So the above case triggers the double free of fastrpc buf.
Fix this by avoiding the call to the second fastrpc_buf_free() if
fastrpc_req_munmap_impl() is successful.
'err' is not updated as it needs to retain the err returned by
qcom_scm_assign_mem(), which is the starting point of this error path.
This is based on static analysis only. Compilation tested.
Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Sukrut Bellary <sukrut.bellary@linux.com>
---
drivers/misc/fastrpc.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/misc/fastrpc.c b/drivers/misc/fastrpc.c
index f48466960f1b..1c3ab78f274f 100644
--- a/drivers/misc/fastrpc.c
+++ b/drivers/misc/fastrpc.c
@@ -1921,7 +1921,10 @@ static int fastrpc_req_mmap(struct fastrpc_user *fl, char __user *argp)
return 0;
err_assign:
- fastrpc_req_munmap_impl(fl, buf);
+ if (!fastrpc_req_munmap_impl(fl, buf)) {
+ /* buf is freed */
+ return err;
+ }
err_invoke:
fastrpc_buf_free(buf);
--
2.34.1
next reply other threads:[~2023-05-18 10:09 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-05-18 10:08 Sukrut Bellary [this message]
2023-05-18 10:55 ` [PATCH] misc: fastrpc: Fix double free of 'buf' in error path Dan Carpenter
2023-05-19 2:45 ` Sukrut Bellary
2023-05-19 4:16 ` Dan Carpenter
2023-05-19 6:12 ` Sukrut Bellary
2023-05-19 9:52 ` Srinivas Kandagatla
2023-05-19 10:22 ` Dan Carpenter
2023-05-19 10:39 ` Srinivas Kandagatla
2023-05-19 22:57 ` Sukrut Bellary
2023-06-01 4:45 ` Sukrut Bellary
2023-06-01 7:00 ` Dan Carpenter
2023-06-01 19:09 ` Sukrut Bellary
2023-05-19 10:58 ` Dan Carpenter
2023-05-19 23:39 ` Sukrut Bellary
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=20230518100829.515143-1-sukrut.bellary@linux.com \
--to=sukrut.bellary@linux.com \
--cc=amahesh@qti.qualcomm.com \
--cc=arnd@arndb.de \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=skhan@linuxfoundation.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