From: Lubomir Rintel <lkundrak@v3.sk>
To: Marc Zyngier <maz@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Jason Cooper <jason@lakedaemon.net>,
linux-kernel@vger.kernel.org, Lubomir Rintel <lkundrak@v3.sk>
Subject: [PATCH 2/2] irqchip/mmp: Avoid overflowing icu_data[]
Date: Wed, 19 Feb 2020 09:00:24 +0100 [thread overview]
Message-ID: <20200219080024.4002-3-lkundrak@v3.sk> (raw)
In-Reply-To: <20200219080024.4002-1-lkundrak@v3.sk>
In case someone messes up and adds too many interrupt muxes in the device
tree, icu_data would overflow into things that follow it in bss, likely
mmp_icu2_base and mmp_icu_base.
Let's add a safeguard, so that we fail gracefully instead of panicking
at some later point for reasons that are then not immediately clear.
Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
---
drivers/irqchip/irq-mmp.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/drivers/irqchip/irq-mmp.c b/drivers/irqchip/irq-mmp.c
index f597d96409a1f..c7ef2cea1c020 100644
--- a/drivers/irqchip/irq-mmp.c
+++ b/drivers/irqchip/irq-mmp.c
@@ -505,6 +505,11 @@ static int __init mmp2_mux_of_init(struct device_node *node,
return -ENODEV;
i = max_icu_nr;
+ if (i >= MAX_ICU_NR) {
+ pr_err("Too many interrupt muxes\n");
+ return -EINVAL;
+ }
+
ret = of_property_read_u32(node, "mrvl,intc-nr-irqs",
&nr_irqs);
if (ret) {
--
2.24.1
next prev parent reply other threads:[~2020-02-19 8:00 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-19 8:00 [PATCH 0/2] irqchip/mmp: A pair of robustness fixed Lubomir Rintel
2020-02-19 8:00 ` [PATCH 1/2] irqchip/mmp: Safeguard against multiple root intc initialization Lubomir Rintel
2020-02-19 8:00 ` Lubomir Rintel [this message]
2020-03-08 14:04 ` [PATCH 0/2] irqchip/mmp: A pair of robustness fixed Marc Zyngier
2020-03-08 14:46 ` Lubomir Rintel
2020-03-08 17:26 ` Marc Zyngier
2020-03-09 10:10 ` Lubomir Rintel
2020-03-09 16:13 ` Rob Herring
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=20200219080024.4002-3-lkundrak@v3.sk \
--to=lkundrak@v3.sk \
--cc=jason@lakedaemon.net \
--cc=linux-kernel@vger.kernel.org \
--cc=maz@kernel.org \
--cc=tglx@linutronix.de \
/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