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 v2 2/8] bus: mhi: core: Add range check for channel id received in event ring
Date: Mon, 27 Apr 2020 19:59:20 -0700 [thread overview]
Message-ID: <1588042766-17496-3-git-send-email-bbhatt@codeaurora.org> (raw)
In-Reply-To: <1588042766-17496-1-git-send-email-bbhatt@codeaurora.org>
From: Hemant Kumar <hemantk@codeaurora.org>
MHI data completion handler function reads channel id from event
ring element. Value is under the control of MHI devices and can be
any value between 0 and 255. In order to prevent out of bound access
add a bound check against the max channel supported by controller
and skip processing of that event ring element.
Signed-off-by: Hemant Kumar <hemantk@codeaurora.org>
Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
---
drivers/bus/mhi/core/main.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c
index 23154f1..1ccd4cc 100644
--- a/drivers/bus/mhi/core/main.c
+++ b/drivers/bus/mhi/core/main.c
@@ -827,6 +827,9 @@ int mhi_process_data_event_ring(struct mhi_controller *mhi_cntrl,
enum mhi_pkt_type type = MHI_TRE_GET_EV_TYPE(local_rp);
chan = MHI_TRE_GET_EV_CHID(local_rp);
+ if (WARN_ON(chan >= mhi_cntrl->max_chan))
+ goto next_event;
+
mhi_chan = &mhi_cntrl->mhi_chan[chan];
if (likely(type == MHI_PKT_TYPE_TX_EVENT)) {
@@ -837,6 +840,7 @@ int mhi_process_data_event_ring(struct mhi_controller *mhi_cntrl,
event_quota--;
}
+next_event:
mhi_recycle_ev_ring_element(mhi_cntrl, ev_ring);
local_rp = ev_ring->rp;
dev_rp = mhi_to_virtual(ev_ring, er_ctxt->rp);
--
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-28 3:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 2:59 [RESEND PATCH v2 0/8] Bug fixes and improved logging in MHI Bhaumik Bhatt
2020-04-28 2:59 ` [PATCH v2 1/8] bus: mhi: core: Cache intmod from mhi event to mhi channel Bhaumik Bhatt
2020-04-28 14:39 ` Jeffrey Hugo
2020-04-29 17:27 ` Hemant Kumar
2020-04-28 2:59 ` Bhaumik Bhatt [this message]
2020-04-28 14:44 ` [PATCH v2 2/8] bus: mhi: core: Add range check for channel id received in event ring Jeffrey Hugo
2020-04-29 17:29 ` Hemant Kumar
2020-04-28 2:59 ` [PATCH v2 3/8] bus: mhi: core: Read transfer length from an event properly Bhaumik Bhatt
2020-04-28 14:50 ` Jeffrey Hugo
2020-04-29 17:30 ` Hemant Kumar
2020-04-28 2:59 ` [PATCH v2 4/8] bus: mhi: core: Handle firmware load using state worker Bhaumik Bhatt
2020-04-28 14:27 ` Jeffrey Hugo
2020-04-28 2:59 ` [PATCH v2 5/8] bus: mhi: core: WARN_ON for malformed vector table Bhaumik Bhatt
2020-04-28 2:59 ` [PATCH v2 6/8] bus: mhi: core: Return appropriate error codes for AMSS load failure Bhaumik Bhatt
2020-04-28 2:59 ` [PATCH v2 7/8] bus: mhi: core: Improve debug logs for loading firmware Bhaumik Bhatt
2020-04-28 2:59 ` [PATCH v2 8/8] bus: mhi: core: Ensure non-zero session or sequence ID values 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=1588042766-17496-3-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).