From d8d2dda141c198a2e9863584e2e61566cc6b222d Mon Sep 17 00:00:00 2001 From: Eric van Gyzen Date: Fri, 18 Sep 2020 20:53:40 +0000 Subject: amd64 pmap_pkru_same: prev_ppr was always NULL Fix the logic so it works as it appears. Reported by: Coverity Reviewed by: kib MFC after: 2 weeks Sponsored by: Dell EMC Isilon Differential Revision: D26211 (in progress, so omitting full URL) --- sys/amd64/amd64/pmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index bfeee119f2ee..d04d2457a1da 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -10788,9 +10788,11 @@ pmap_pkru_same(pmap_t pmap, vm_offset_t sva, vm_offset_t eva) sva >= VM_MAXUSER_ADDRESS) return (true); MPASS(eva <= VM_MAXUSER_ADDRESS); - for (va = sva, prev_ppr = NULL; va < eva;) { + for (va = sva; va < eva; prev_ppr = ppr) { ppr = rangeset_lookup(&pmap->pm_pkru, va); - if ((ppr == NULL) ^ (prev_ppr == NULL)) + if (va == sva) + prev_ppr = ppr; + else if ((ppr == NULL) ^ (prev_ppr == NULL)) return (false); if (ppr == NULL) { va += PAGE_SIZE; -- cgit v1.2.3