Skip to content

Commit 546362a

Browse files
Bhaumik Bhattgregkh
authored andcommitted
bus: mhi: core: Validate channel ID when processing command completions
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. Link: https://lore.kernel.org/r/1624558141-11045-1-git-send-email-bbhatt@codeaurora.org Fixes: 1d3173a ("bus: mhi: core: Add support for processing events from client device") Cc: stable@vger.kernel.org #5.10 Reviewed-by: Hemant Kumar <hemantk@codeaurora.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Reviewed-by: Jeffrey Hugo <quic_jhugo@quicinc.com> Signed-off-by: Bhaumik Bhatt <bbhatt@codeaurora.org> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Link: https://lore.kernel.org/r/20210716075106.49938-3-manivannan.sadhasivam@linaro.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 56f6f4c commit 546362a

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

drivers/bus/mhi/core/main.c

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -773,11 +773,18 @@ static void mhi_process_cmd_completion(struct mhi_controller *mhi_cntrl,
773773
cmd_pkt = mhi_to_virtual(mhi_ring, ptr);
774774

775775
chan = MHI_TRE_GET_CMD_CHID(cmd_pkt);
776-
mhi_chan = &mhi_cntrl->mhi_chan[chan];
777-
write_lock_bh(&mhi_chan->lock);
778-
mhi_chan->ccs = MHI_TRE_GET_EV_CODE(tre);
779-
complete(&mhi_chan->completion);
780-
write_unlock_bh(&mhi_chan->lock);
776+
777+
if (chan < mhi_cntrl->max_chan &&
778+
mhi_cntrl->mhi_chan[chan].configured) {
779+
mhi_chan = &mhi_cntrl->mhi_chan[chan];
780+
write_lock_bh(&mhi_chan->lock);
781+
mhi_chan->ccs = MHI_TRE_GET_EV_CODE(tre);
782+
complete(&mhi_chan->completion);
783+
write_unlock_bh(&mhi_chan->lock);
784+
} else {
785+
dev_err(&mhi_cntrl->mhi_dev->dev,
786+
"Completion packet for invalid channel ID: %d\n", chan);
787+
}
781788

782789
mhi_del_ring_element(mhi_cntrl, mhi_ring);
783790
}

0 commit comments

Comments
 (0)