diff options
| author | Zijun Hu <quic_zijuhu@quicinc.com> | 2024-12-09 21:24:59 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-12-27 14:02:17 +0100 |
| commit | 2976661ed4de10bd1945e7cca0d7363b44f240dd (patch) | |
| tree | 2cb2cbce52a6fcc5159d262cc2f21906a51fe5f8 | |
| parent | 3931567bf1757a2ce9c03bb3c935a7c036636c4c (diff) | |
of/irq: Fix interrupt-map cell length check in of_irq_parse_imap_parent()
commit fec3edc47d5cfc2dd296a5141df887bf567944db upstream.
On a malformed interrupt-map property which is shorter than expected by
1 cell, we may read bogus data past the end of the property instead of
returning an error in of_irq_parse_imap_parent().
Decrement the remaining length when skipping over the interrupt parent
phandle cell.
Fixes: 935df1bd40d4 ("of/irq: Factor out parsing of interrupt-map parent phandle+args from of_irq_parse_raw()")
Cc: stable@vger.kernel.org
Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
Link: https://lore.kernel.org/r/20241209-of_irq_fix-v1-1-782f1419c8a1@quicinc.com
[rh: reword commit msg]
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/of/irq.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/of/irq.c b/drivers/of/irq.c index a494f56a0d0e..696bf80aa944 100644 --- a/drivers/of/irq.c +++ b/drivers/of/irq.c @@ -111,6 +111,7 @@ const __be32 *of_irq_parse_imap_parent(const __be32 *imap, int len, struct of_ph else np = of_find_node_by_phandle(be32_to_cpup(imap)); imap++; + len--; /* Check if not found */ if (!np) { |