lkml.org 
[lkml]   [2021]   [Jun]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [PATCH] bus: mhi: core: Validate channel ID when processing command completions
On Thu, Jun 24, 2021 at 11:09:01AM -0700, Bhaumik Bhatt wrote:
> MHI reads the channel ID from the event ring element sent by the
> device which can be any value between 0 and 255. In order to
> prevent any out of bound accesses, add a check against the maximum
> number of channels supported by the controller and those channels
> not configured yet so as to skip processing of that event ring
> element.
>
> Fixes: 1d3173a3bae7 ("bus: mhi: core: Add support for processing events from client device")
> Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org>
> Reviewed-by: Hemant Kumar <hemantk@codeaurora.org>
> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
> Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com>
> Link: https://lore.kernel.org/r/1619481538-4435-1-git-send-email-bbhatt@codeaurora.org

Removed "Link" and applied to mhi-next!

Thanks,
Mani

> ---
> drivers/bus/mhi/core/main.c | 17 ++++++++++++-----
> 1 file changed, 12 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/bus/mhi/core/main.c b/drivers/bus/mhi/core/main.c
> index 22acde1..fc9196f 100644
> --- a/drivers/bus/mhi/core/main.c
> +++ b/drivers/bus/mhi/core/main.c
> @@ -773,11 +773,18 @@ static void mhi_process_cmd_completion(struct mhi_controller *mhi_cntrl,
> cmd_pkt = mhi_to_virtual(mhi_ring, ptr);
>
> chan = MHI_TRE_GET_CMD_CHID(cmd_pkt);
> - mhi_chan = &mhi_cntrl->mhi_chan[chan];
> - write_lock_bh(&mhi_chan->lock);
> - mhi_chan->ccs = MHI_TRE_GET_EV_CODE(tre);
> - complete(&mhi_chan->completion);
> - write_unlock_bh(&mhi_chan->lock);
> +
> + if (chan < mhi_cntrl->max_chan &&
> + mhi_cntrl->mhi_chan[chan].configured) {
> + mhi_chan = &mhi_cntrl->mhi_chan[chan];
> + write_lock_bh(&mhi_chan->lock);
> + mhi_chan->ccs = MHI_TRE_GET_EV_CODE(tre);
> + complete(&mhi_chan->completion);
> + write_unlock_bh(&mhi_chan->lock);
> + } else {
> + dev_err(&mhi_cntrl->mhi_dev->dev,
> + "Completion packet for invalid channel ID: %d\n", chan);
> + }
>
> mhi_del_ring_element(mhi_cntrl, mhi_ring);
> }
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>

\
 
 \ /
  Last update: 2021-06-25 07:24    [W:0.068 / U:0.008 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site