From: Stephen Boyd <sboyd@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: David Collins <collinsd@codeaurora.org>,
linux-kernel@vger.kernel.org, patches@lists.linux.dev,
Fenglin Wu <quic_fenglinw@quicinc.com>
Subject: [PATCH 8/9] spmi: pmic-arb: block access for invalid PMIC arbiter v5 SPMI writes
Date: Thu, 29 Sep 2022 17:50:17 -0700 [thread overview]
Message-ID: <20220930005019.2663064-9-sboyd@kernel.org> (raw)
In-Reply-To: <20220930005019.2663064-1-sboyd@kernel.org>
From: David Collins <collinsd@codeaurora.org>
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>
---
drivers/spmi/spmi-pmic-arb.c | 5 +++++
1 file changed, 5 insertions(+)
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;
}
--
https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git/
https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git
next prev parent reply other threads:[~2022-09-30 0:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-30 0:50 [PATCH 0/9] SPMI patches for v6.1 Stephen Boyd
2022-09-30 0:50 ` [PATCH 1/9] drivers: spmi: Directly use ida_alloc()/free() Stephen Boyd
2022-09-30 0:50 ` [PATCH 2/9] spmi: pmic-arb: add a print in cleanup_irq Stephen Boyd
2022-09-30 0:50 ` [PATCH 3/9] spmi: pmic-arb: handle spurious interrupt Stephen Boyd
2022-09-30 0:50 ` [PATCH 4/9] spmi: pmic-arb: do not ack and clear peripheral interrupts in cleanup_irq Stephen Boyd
2022-09-30 0:50 ` [PATCH 5/9] spmi: pmic-arb: check apid against limits before calling irq handler Stephen Boyd
2022-09-30 0:50 ` [PATCH 6/9] spmi: pmic-arb: add support to dispatch interrupt based on IRQ status Stephen Boyd
2022-09-30 0:50 ` [PATCH 7/9] spmi: pmic-arb: correct duplicate APID to PPID mapping logic Stephen Boyd
2022-09-30 0:50 ` Stephen Boyd [this message]
2022-09-30 0:50 ` [PATCH 9/9] spmi: pmic-arb: increase SPMI transaction timeout delay Stephen Boyd
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220930005019.2663064-9-sboyd@kernel.org \
--to=sboyd@kernel.org \
--cc=collinsd@codeaurora.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=patches@lists.linux.dev \
--cc=quic_fenglinw@quicinc.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).