shithub: riscv

Info  •  Files  •  Log  •  Branches

mtrr: fix mtrr index out of range for vcnt > Nmtrr

--- a/sys/src/9/pc/mtrr.c

+++ b/sys/src/9/pc/mtrr.c

@@ -290,6 +290,8 @@

 	qlock(&mtrrlk);

 	slot = -1;

 	vcnt = cap & Capvcnt;

+	if(vcnt > Nmtrr)

+		vcnt = Nmtrr;

 	for(i = 0; i < vcnt; i++){

 		mtrrget(&mtrr, i);

 		mok = mtrrdec(&mtrr, &mp, &msize, &mtype);

@@ -330,6 +332,8 @@

 	n += snprint(buf+n, bufsize-n, "cache default %s\n",

 		type2str(def & Deftype));

 	vcnt = cap & Capvcnt;

+	if(vcnt > Nmtrr)

+		vcnt = Nmtrr;

 	for(i = 0; i < vcnt; i++){

 		mtrrget(&mtrr, i);

 		if (mtrrdec(&mtrr, &base, &size, &type))

-- 

⑨