]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
irqchip/gic-v3: Work around insecure GIC integrations
authorMarc Zyngier <maz@kernel.org>
Fri, 13 Dec 2024 14:10:37 +0000 (14:10 +0000)
committerThomas Gleixner <tglx@linutronix.de>
Fri, 13 Dec 2024 17:15:29 +0000 (18:15 +0100)
It appears that the relatively popular RK3399 SoC has been put together
using a large amount of illicit substances, as experiments reveal that its
integration of GIC500 exposes the *secure* programming interface to
non-secure.

This has some pretty bad effects on the way priorities are handled, and
results in a dead machine if booting with pseudo-NMI enabled
(irqchip.gicv3_pseudo_nmi=1) if the kernel contains 18fdb6348c480 ("arm64:
irqchip/gic-v3: Select priorities at boot time"), which relies on the
priorities being programmed using the NS view.

Let's restore some sanity by going one step further and disable security
altogether in this case. This is not any worse, and puts us in a mode where
priorities actually make some sense.

Huge thanks to Mark Kettenis who initially identified this issue on
OpenBSD, and to Chen-Yu Tsai who reported the problem in Linux.

Fixes: 18fdb6348c480 ("arm64: irqchip/gic-v3: Select priorities at boot time")
Reported-by: Mark Kettenis <mark.kettenis@xs4all.nl>
Reported-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Tested-by: Chen-Yu Tsai <wens@csie.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/all/20241213141037.3995049-1-maz@kernel.org
drivers/irqchip/irq-gic-v3.c

index 34db379d066a5b95716d68dc434afef945941d47..79d8cc80693c3120f744735f0a5a2a1549aa46bb 100644 (file)
@@ -161,7 +161,22 @@ static bool cpus_have_group0 __ro_after_init;
 
 static void __init gic_prio_init(void)
 {
-       cpus_have_security_disabled = gic_dist_security_disabled();
+       bool ds;
+
+       ds = gic_dist_security_disabled();
+       if (!ds) {
+               u32 val;
+
+               val = readl_relaxed(gic_data.dist_base + GICD_CTLR);
+               val |= GICD_CTLR_DS;
+               writel_relaxed(val, gic_data.dist_base + GICD_CTLR);
+
+               ds = gic_dist_security_disabled();
+               if (ds)
+                       pr_warn("Broken GIC integration, security disabled");
+       }
+
+       cpus_have_security_disabled = ds;
        cpus_have_group0 = gic_has_group0();
 
        /*