Module Name: src
Committed By: rin
Date: Thu Feb 20 05:13:16 UTC 2020
Modified Files:
src/sys/arch/powerpc/ibm4xx: pmap.c
Log Message:
Fix NULL dereference; "pap" argument of pmap_extract(9) can be NULL.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/powerpc/ibm4xx/pmap.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/powerpc/ibm4xx/pmap.c
diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.76 src/sys/arch/powerpc/ibm4xx/pmap.c:1.77
--- src/sys/arch/powerpc/ibm4xx/pmap.c:1.76 Sat Dec 24 19:02:16 2016
+++ src/sys/arch/powerpc/ibm4xx/pmap.c Thu Feb 20 05:13:16 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.76 2016/12/24 19:02:16 cherry Exp $ */
+/* $NetBSD: pmap.c,v 1.77 2020/02/20 05:13:16 rin Exp $ */
/*
* Copyright 2001 Wasabi Systems, Inc.
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.76 2016/12/24 19:02:16 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.77 2020/02/20 05:13:16 rin Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -1021,7 +1021,7 @@ pmap_extract(struct pmap *pm, vaddr_t va
int s;
s = splvm();
- if (pm->pm_ptbl[seg] && (pa = pm->pm_ptbl[seg][ptn])) {
+ if (pm->pm_ptbl[seg] && (pa = pm->pm_ptbl[seg][ptn]) && pap) {
*pap = TTE_PA(pa) | (va & PGOFSET);
}
splx(s);
