This is a note to let you know that I've just added the patch titled bus: mhi: core: Add missing checks for MMIO register entries to the 5.12-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: bus-mhi-core-add-missing-checks-for-mmio-register-entries.patch and it can be found in the queue-5.12 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@xxxxxxxxxxxxxxx> know about it. >From 8de5ad99414347ad08e6ebc2260be1d2e009cb9a Mon Sep 17 00:00:00 2001 From: Bhaumik Bhatt <bbhatt@xxxxxxxxxxxxxx> Date: Tue, 9 Mar 2021 10:44:50 -0800 Subject: bus: mhi: core: Add missing checks for MMIO register entries From: Bhaumik Bhatt <bbhatt@xxxxxxxxxxxxxx> commit 8de5ad99414347ad08e6ebc2260be1d2e009cb9a upstream. As per documentation, fields marked as (required) in an MHI controller structure need to be populated by the controller driver before calling mhi_register_controller(). Ensure all required pointers and non-zero fields are present in the controller before proceeding with the registration. Signed-off-by: Bhaumik Bhatt <bbhatt@xxxxxxxxxxxxxx> Reviewed-by: Jeffrey Hugo <jhugo@xxxxxxxxxxxxxx> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx> Link: https://lore.kernel.org/r/1615315490-36017-1-git-send-email-bbhatt@xxxxxxxxxxxxxx Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- drivers/bus/mhi/core/init.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) --- a/drivers/bus/mhi/core/init.c +++ b/drivers/bus/mhi/core/init.c @@ -876,12 +876,10 @@ int mhi_register_controller(struct mhi_c u32 soc_info; int ret, i; - if (!mhi_cntrl) - return -EINVAL; - - if (!mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put || + if (!mhi_cntrl || !mhi_cntrl->cntrl_dev || !mhi_cntrl->regs || + !mhi_cntrl->runtime_get || !mhi_cntrl->runtime_put || !mhi_cntrl->status_cb || !mhi_cntrl->read_reg || - !mhi_cntrl->write_reg || !mhi_cntrl->nr_irqs) + !mhi_cntrl->write_reg || !mhi_cntrl->nr_irqs || !mhi_cntrl->irq) return -EINVAL; ret = parse_config(mhi_cntrl, config); Patches currently in stable-queue which might be from bbhatt@xxxxxxxxxxxxxx are queue-5.12/bus-mhi-pci_generic-remove-wq_mem_reclaim-flag-from-state-workqueue.patch queue-5.12/bus-mhi-core-fix-invalid-error-returning-in-mhi_queue.patch queue-5.12/bus-mhi-core-clear-configuration-from-channel-context-during-reset.patch queue-5.12/bus-mhi-core-add-missing-checks-for-mmio-register-entries.patch