FAILED: patch "[PATCH] bus: mhi: host: Range check CHDBOFF and ERDBOFF" failed to apply to 5.10-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 5.10-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
To reproduce the conflict and resubmit, you may use the following commands:
git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-5.10.y
git checkout FETCH_HEAD
git cherry-pick -x 6a0c637bfee69a74c104468544d9f2a6579626d0
# <resolve conflicts, build, test, etc.>
git commit -s
git send-email --to '<[email protected]>' --in-reply-to '2023050613-slacked-gush-009c@gregkh' --subject-prefix 'PATCH 5.10.y' HEAD^..
Possible dependencies:
6a0c637bfee6 ("bus: mhi: host: Range check CHDBOFF and ERDBOFF")
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 6a0c637bfee69a74c104468544d9f2a6579626d0 Mon Sep 17 00:00:00 2001
From: Jeffrey Hugo <[email protected]>
Date: Fri, 24 Mar 2023 10:13:04 -0600
Subject: [PATCH] bus: mhi: host: Range check CHDBOFF and ERDBOFF
If the value read from the CHDBOFF and ERDBOFF registers is outside the range of the MHI register space then an invalid address might be computed which later causes a kernel panic. Range check the read value to prevent a crash due to bad data from the device.
drivers/bus/mhi/host/init.c +12 -0
@@ -516,6 +516,12 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl)return -EIO ; } +if (val >= mhi_cntrl->reg_len - (8 *MHI_DEV_WAKE_DB )) { +dev_err (dev,"CHDB offset: 0x%x is out of range: 0x%zx\n" , + val, mhi_cntrl->reg_len - (8 *MHI_DEV_WAKE_DB )); +return -ERANGE ; + } +/* Setup wake db */ mhi_cntrl->wake_db = base + val + (8 *MHI_DEV_WAKE_DB ); mhi_cntrl->wake_set = false;
@@ -532,6 +538,12 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl)return -EIO ; } +if (val >= mhi_cntrl->reg_len - (8 * mhi_cntrl->total_ev_rings)) { +dev_err (dev,"ERDB offset: 0x%x is out of range: 0x%zx\n" , + val, mhi_cntrl->reg_len - (8 * mhi_cntrl->total_ev_rings)); +return -ERANGE ; + } +/* Setup event db address for each ev_ring */ mhi_event = mhi_cntrl->mhi_event;for (i =0 ; i < mhi_cntrl->total_ev_rings; i++, val +=8 , mhi_event++) {
PATCH 1/1 bus: mhi: host: Range check CHDBOFF and ERDBOFF
Commit 6a0c637bfee69a74c104468544d9f2a6579626d0 upstream.
If the value read from the CHDBOFF and ERDBOFF registers is outside the range of the MHI register space then an invalid address might be computed which later causes a kernel panic. Range check the read value to prevent a crash due to bad data from the device.
--- drivers/bus/mhi/core/init.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/bus/mhi/core/init.c +12 -0
@@ -498,6 +498,12 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl)return -EIO ; } +if (val >= mhi_cntrl->reg_len - (8 *MHI_DEV_WAKE_DB )) { +dev_err (dev,"CHDB offset: 0x%x is out of range: 0x%zx\n" , + val, mhi_cntrl->reg_len - (8 *MHI_DEV_WAKE_DB )); +return -ERANGE ; + } +/* Setup wake db */ mhi_cntrl->wake_db = base + val + (8 *MHI_DEV_WAKE_DB );mhi_write_reg (mhi_cntrl, mhi_cntrl->wake_db,4 ,0 );
@@ -517,6 +523,12 @@ int mhi_init_mmio(struct mhi_controller *mhi_cntrl)return -EIO ; } +if (val >= mhi_cntrl->reg_len - (8 * mhi_cntrl->total_ev_rings)) { +dev_err (dev,"ERDB offset: 0x%x is out of range: 0x%zx\n" , + val, mhi_cntrl->reg_len - (8 * mhi_cntrl->total_ev_rings)); +return -ERANGE ; + } +/* Setup event db address for each ev_ring */ mhi_event = mhi_cntrl->mhi_event;for (i =0 ; i < mhi_cntrl->total_ev_rings; i++, val +=8 , mhi_event++) {
Signature · 1 line
2.7.4
Greg KH
maintainerRe: [PATCH 5.10.y] bus: mhi: host: Range check CHDBOFF and ERDBOFF
Quoted 14 lines · Jeffrey Hugo
Commit
6a0c637bfee69a74c104468544d9f2a6579626d0upstream.If the value read from the CHDBOFF and ERDBOFF registers is outside the range of the MHI register space then an invalid address might be computed which later causes a kernel panic. Range check the read value to prevent a crash due to bad data from the device.
Fixes 6cd330ae76ff ("bus: mhi: core: Add support for ringing channel/event ring doorbells")Signed-off-by Jeffrey Hugo <[email protected]>Reviewed-by Manivannan Sadhasivam <[email protected]>Signed-off-by Manivannan Sadhasivam <[email protected]>
Quoted 3 lines
--- drivers/bus/mhi/core/init.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
This breaks the build, did you test it?
Re: [PATCH 5.10.y] bus: mhi: host: Range check CHDBOFF and ERDBOFF
Quoted 19 lines · Greg KH
Quoted 14 lines · Jeffrey Hugo
Commit
6a0c637bfee69a74c104468544d9f2a6579626d0upstream.If the value read from the CHDBOFF and ERDBOFF registers is outside the range of the MHI register space then an invalid address might be computed which later causes a kernel panic. Range check the read value to prevent a crash due to bad data from the device.
Fixes 6cd330ae76ff ("bus: mhi: core: Add support for ringing channel/event ring doorbells")Signed-off-by Jeffrey Hugo <[email protected]>Reviewed-by Manivannan Sadhasivam <[email protected]>Signed-off-by Manivannan Sadhasivam <[email protected]>Quoted 3 lines
--- drivers/bus/mhi/core/init.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
Quoted 2 lines
This breaks the build, did you test it?
Checked the workspace and it is "working". Recreated it from scratch, and I see the build failure. Clearly I messed something up.
Will fix. Sorry.