irqchip/gic: Correctly validate OF quirk descriptors
[ Upstream commit 91539341a3b6e9c868024a4292455dae36e6f58c ] When checking for OF quirks, make sure either 'compatible' or 'property' is set, and give up otherwise. This avoids non-OF quirks being randomly applied as they don't have any of the OF data that need checking. Cc: Douglas Anderson <dianders@chromium.org> Reported-by: Geert Uytterhoeven <geert+renesas@glider.be> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Fixes: 44bd78dd2b88 ("irqchip/gic-v3: Disable pseudo NMIs on Mediatek devices w/ firmware issues") Signed-off-by: Marc Zyngier <maz@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
2a2641a842
commit
93a68acc49
@@ -29,6 +29,8 @@ void gic_enable_of_quirks(const struct device_node *np,
|
|||||||
const struct gic_quirk *quirks, void *data)
|
const struct gic_quirk *quirks, void *data)
|
||||||
{
|
{
|
||||||
for (; quirks->desc; quirks++) {
|
for (; quirks->desc; quirks++) {
|
||||||
|
if (!quirks->compatible && !quirks->property)
|
||||||
|
continue;
|
||||||
if (quirks->compatible &&
|
if (quirks->compatible &&
|
||||||
!of_device_is_compatible(np, quirks->compatible))
|
!of_device_is_compatible(np, quirks->compatible))
|
||||||
continue;
|
continue;
|
||||||
|
|||||||
Reference in New Issue
Block a user