Module Name: src
Committed By: jakllsch
Date: Mon Nov 19 13:54:15 UTC 2018
Modified Files:
src/sys/arch/arm/fdt: gicv3_fdt.c
Log Message:
avoid NULL deref in gicv3_fdt_disestablish()
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/fdt/gicv3_fdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/fdt/gicv3_fdt.c
diff -u src/sys/arch/arm/fdt/gicv3_fdt.c:1.4 src/sys/arch/arm/fdt/gicv3_fdt.c:1.5
--- src/sys/arch/arm/fdt/gicv3_fdt.c:1.4 Sat Nov 10 01:24:06 2018
+++ src/sys/arch/arm/fdt/gicv3_fdt.c Mon Nov 19 13:54:15 2018
@@ -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 <jmcne...@invisible.ca>
@@ -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 @@ gicv3_fdt_disestablish(device_t dev, voi
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);
