aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/drivers/spmi
diff options
context:
space:
mode:
authorDavid Collins <collinsd@codeaurora.org>2022-09-29 17:50:17 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2022-09-30 14:33:23 +0200
commitc8669773c74e26ceb2412215a2db40399e3fe119 (patch)
treea3f52f7d001fa530e0814aaa706b0f9baa65f04f /drivers/spmi
parentspmi: pmic-arb: correct duplicate APID to PPID mapping logic (diff)
downloadwireguard-linux-c8669773c74e26ceb2412215a2db40399e3fe119.tar.xz
wireguard-linux-c8669773c74e26ceb2412215a2db40399e3fe119.zip
spmi: pmic-arb: block access for invalid PMIC arbiter v5 SPMI writes
The system crashes due to an access permission violation when writing to a PMIC peripheral which is not owned by the current ee. Add a check for PMIC arbiter version 5 for such invalid write requests and return an error instead of crashing the system. Signed-off-by: David Collins <collinsd@codeaurora.org> Signed-off-by: Fenglin Wu <quic_fenglinw@quicinc.com> Link: https://lore.kernel.org/r/1655004286-11493-8-git-send-email-quic_fenglinw@quicinc.com Signed-off-by: Stephen Boyd <sboyd@kernel.org> Link: https://lore.kernel.org/r/20220930005019.2663064-9-sboyd@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/spmi')
-rw-r--r--drivers/spmi/spmi-pmic-arb.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/spmi/spmi-pmic-arb.c b/drivers/spmi/spmi-pmic-arb.c
index cf92abc51689..39f25bc26233 100644
--- a/drivers/spmi/spmi-pmic-arb.c
+++ b/drivers/spmi/spmi-pmic-arb.c
@@ -1133,6 +1133,11 @@ static int pmic_arb_offset_v5(struct spmi_pmic_arb *pmic_arb, u8 sid, u16 addr,
offset = 0x10000 * pmic_arb->ee + 0x80 * apid;
break;
case PMIC_ARB_CHANNEL_RW:
+ if (pmic_arb->apid_data[apid].write_ee != pmic_arb->ee) {
+ dev_err(&pmic_arb->spmic->dev, "disallowed SPMI write to sid=%u, addr=0x%04X\n",
+ sid, addr);
+ return -EPERM;
+ }
offset = 0x10000 * apid;
break;
}