Skip to content

Commit

Permalink
irqchip/loongson-pch-pic: Fix translate callback for DT path
Browse files Browse the repository at this point in the history
[ Upstream commit c7c0013 ]

In DT path of translate callback, if fwspec->param_count==1
and of_node is non-null, fwspec->param[1] will be accessed,
which is introduced from previous commit bcdd75c
(irqchip/loongson-pch-pic: Add ACPI init support).

Before the patch, for non-null of_node, translate callback
(use irq_domain_translate_twocell()) will return -EINVAL if
fwspec->param_count < 2, so the check in the patch is added.

Fixes: bcdd75c ("irqchip/loongson-pch-pic: Add ACPI init support")
Signed-off-by: Jianmin Lv <lvjianmin@loongson.cn>
Reviewed-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20221022075955.11726-3-lvjianmin@loongson.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
lvjianmin-loongson authored and gregkh committed Dec 31, 2022
1 parent e0d8b51 commit 9e04d25
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions drivers/irqchip/irq-loongson-pch-pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,9 @@ static int pch_pic_domain_translate(struct irq_domain *d,
return -EINVAL;

if (of_node) {
if (fwspec->param_count < 2)
return -EINVAL;

*hwirq = fwspec->param[0] + priv->ht_vec_base;
*type = fwspec->param[1] & IRQ_TYPE_SENSE_MASK;
} else {
Expand Down

0 comments on commit 9e04d25

Please sign in to comment.