[src/trunk]: src/sys/arch/arm/fdt avoid NULL deref in gicv3_fdt_disestablish()

[jakllsch <jakllsch%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/69719eef2c0c
branches:  trunk
changeset: 994725:69719eef2c0c
user:      jakllsch <jakllsch%NetBSD.org@localhost>
date:      Mon Nov 19 13:54:15 2018 +0000

description:
avoid NULL deref in gicv3_fdt_disestablish()

diffstat:

 sys/arch/arm/fdt/gicv3_fdt.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 6ec512b10971 -r 69719eef2c0c sys/arch/arm/fdt/gicv3_fdt.c
--- a/sys/arch/arm/fdt/gicv3_fdt.c      Mon Nov 19 13:28:48 2018 +0000
+++ b/sys/arch/arm/fdt/gicv3_fdt.c      Mon Nov 19 13:54:15 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_fdt.c,v 1.4 2018/11/10 01:24:06 jmcneill Exp $ */
+/* $NetBSD: gicv3_fdt.c,v 1.5 2018/11/19 13:54:15 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2015-2018 Jared McNeill <jmcneill%invisible.ca@localhost>
@@ -29,7 +29,7 @@
 #define        _INTR_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: gicv3_fdt.c,v 1.4 2018/11/10 01:24:06 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_fdt.c,v 1.5 2018/11/19 13:54:15 jakllsch Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -310,7 +310,7 @@
 
        for (n = 0; n < GICV3_MAXIRQ; n++) {
                firq = sc->sc_irq[n];
-               if (firq->intr_ih != ih)
+               if (firq == NULL || firq->intr_ih != ih)
                        continue;
 
                KASSERT(firq->intr_refcnt > 0);