Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 18 Sep 2020 20:53:40 +0000 (UTC)
From:      Eric van Gyzen <vangyzen@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r365890 - head/sys/amd64/amd64
Message-ID:  <202009182053.08IKrem9082561@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vangyzen
Date: Fri Sep 18 20:53:40 2020
New Revision: 365890
URL: https://svnweb.freebsd.org/changeset/base/365890

Log:
  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)

Modified:
  head/sys/amd64/amd64/pmap.c

Modified: head/sys/amd64/amd64/pmap.c
==============================================================================
--- head/sys/amd64/amd64/pmap.c	Fri Sep 18 19:03:34 2020	(r365889)
+++ head/sys/amd64/amd64/pmap.c	Fri Sep 18 20:53:40 2020	(r365890)
@@ -10788,9 +10788,11 @@ pmap_pkru_same(pmap_t pmap, vm_offset_t sva, vm_offset
 	    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;



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009182053.08IKrem9082561>