From: Bhaumik Bhatt <bbhatt@codeaurora.org>
To: mani@kernel.org
Cc: linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org,
hemantk@codeaurora.org, Bhaumik Bhatt <bbhatt@codeaurora.org>
Subject: [PATCH v1 5/8] bus: mhi: core: WARN_ON for malformed vector table
Date: Mon, 27 Apr 2020 11:32:19 -0700 [thread overview]
Message-ID: <1588012342-4995-6-git-send-email-bbhatt@codeaurora.org> (raw)
In-Reply-To: <1588012342-4995-1-git-send-email-bbhatt@codeaurora.org>
Add a bounds check in the firmware copy routine to exit if a malformed
vector table is found while attempting to load the firmware in to the
BHIe vector table.
Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
---
drivers/bus/mhi/core/boot.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/bus/mhi/core/boot.c b/drivers/bus/mhi/core/boot.c
index 17c636b..bc70edc 100644
--- a/drivers/bus/mhi/core/boot.c
+++ b/drivers/bus/mhi/core/boot.c
@@ -362,8 +362,14 @@ static void mhi_firmware_copy(struct mhi_controller *mhi_cntrl,
int i = 0;
struct mhi_buf *mhi_buf = img_info->mhi_buf;
struct bhi_vec_entry *bhi_vec = img_info->bhi_vec;
+ struct device *dev = &mhi_cntrl->mhi_dev->dev;
while (remainder) {
+ if (WARN_ON(i >= img_info->entries)) {
+ dev_err(dev, "Malformed vector table\n");
+ return;
+ }
+
to_cpy = min(remainder, mhi_buf->len);
memcpy(mhi_buf->buf, buf, to_cpy);
bhi_vec->dma_addr = mhi_buf->dma_addr;
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
next prev parent reply other threads:[~2020-04-27 18:32 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-27 18:32 [RESEND PATCH v1 0/8] Bug fixes and improved logging in MHI Bhaumik Bhatt
2020-04-27 18:32 ` [PATCH v1 1/8] bus: mhi: core: Cache intmod from mhi event to mhi channel Bhaumik Bhatt
2020-04-27 18:32 ` [PATCH v1 2/8] bus: mhi: core: Add range check for channel id received in event ring Bhaumik Bhatt
2020-04-27 18:50 ` Jeffrey Hugo
2020-04-28 1:28 ` Hemant Kumar
2020-04-27 18:32 ` [PATCH v1 3/8] bus: mhi: core: Read transfer length from an event properly Bhaumik Bhatt
2020-04-27 18:32 ` [PATCH v1 4/8] bus: mhi: core: Handle firmware load using state worker Bhaumik Bhatt
2020-04-27 18:32 ` Bhaumik Bhatt [this message]
2020-04-27 18:32 ` [PATCH v1 6/8] bus: mhi: core: Return appropriate error codes for AMSS load failure Bhaumik Bhatt
2020-04-27 18:32 ` [PATCH v1 7/8] bus: mhi: core: Improve debug logs for loading firmware Bhaumik Bhatt
2020-04-27 18:32 ` [PATCH v1 8/8] bus: mhi: core: Ensure non-zero session or sequence ID values Bhaumik Bhatt
-- strict thread matches above, loose matches on Subject: below --
2020-04-22 4:19 [PATCH v1 0/8] Bug fixes and improved logging in MHI Bhaumik Bhatt
2020-04-22 4:19 ` [PATCH v1 5/8] bus: mhi: core: WARN_ON for malformed vector table Bhaumik Bhatt
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=1588012342-4995-6-git-send-email-bbhatt@codeaurora.org \
--to=bbhatt@codeaurora.org \
--cc=hemantk@codeaurora.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mani@kernel.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).