CVS commit: pkgsrc/sysutils/memtestplus

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Mon Jan 29 11:52:11 UTC 2018

Modified Files:
        pkgsrc/sysutils/memtestplus: Makefile distinfo
Added Files:
        pkgsrc/sysutils/memtestplus/patches: patch-controller.c

Log Message:
memtestplus: spell arraycount correctly and avoid UB.

might help PR pkg/52962: memtestplus doesn't work if built with recent
compilers.

PKGREVISION++


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/memtestplus/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/sysutils/memtestplus/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/memtestplus/patches/patch-controller.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/memtestplus/Makefile
diff -u pkgsrc/sysutils/memtestplus/Makefile:1.22 pkgsrc/sysutils/memtestplus/Makefile:1.23
--- pkgsrc/sysutils/memtestplus/Makefile:1.22   Mon Jan 15 09:50:47 2018
+++ pkgsrc/sysutils/memtestplus/Makefile        Mon Jan 29 11:52:10 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2018/01/15 09:50:47 jperkin Exp $
+# $NetBSD: Makefile,v 1.23 2018/01/29 11:52:10 maya Exp $
 #
 
 # Note -- version number also in the do-install rule
@@ -7,7 +7,7 @@ MINVER=01
 
 DISTNAME=              memtest86+-${MAJVER}.${MINVER}
 PKGNAME=               memtestplus-${MAJVER}.${MINVER}
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            sysutils
 MASTER_SITES=          http://www.memtest.org/download/${MAJVER}.${MINVER}/
 

Index: pkgsrc/sysutils/memtestplus/distinfo
diff -u pkgsrc/sysutils/memtestplus/distinfo:1.12 pkgsrc/sysutils/memtestplus/distinfo:1.13
--- pkgsrc/sysutils/memtestplus/distinfo:1.12   Wed Nov  4 01:32:21 2015
+++ pkgsrc/sysutils/memtestplus/distinfo        Mon Jan 29 11:52:10 2018
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.12 2015/11/04 01:32:21 agc Exp $
+$NetBSD: distinfo,v 1.13 2018/01/29 11:52:10 maya Exp $
 
 SHA1 (memtest86+-5.01.tar.gz) = eb4b6d70114db3c9ed320785da44c0ba8349c10c
 RMD160 (memtest86+-5.01.tar.gz) = 756b57d8f8a3b7408aba0b2fc0cadcdc1df966df
@@ -8,6 +8,7 @@ SHA1 (patch-aa) = df9482d024449c6fc853f0
 SHA1 (patch-ab) = 04ca819d23656c5a73625b457ad730c0cf33e751
 SHA1 (patch-ac) = 9186952e34139b4d4aab6c266a224921a4d39659
 SHA1 (patch-ad) = ab31fec30052fdd3c473ee885ba00d7e3676384f
+SHA1 (patch-controller.c) = 8509599b72f1f11115dc58605b0f438ddfca9b4a
 SHA1 (patch-main.c) = 82e1830d119394f83fa4fd69d492bcc38fe8946f
 SHA1 (patch-makeiso.sh) = 939056a96a1384e4d27772bf5612a755deca8145
 SHA1 (patch-nbstart.S) = d97a6e9c25a57d0f5510c3acf4dccf0f0c0c31b0

Added files:

Index: pkgsrc/sysutils/memtestplus/patches/patch-controller.c
diff -u /dev/null pkgsrc/sysutils/memtestplus/patches/patch-controller.c:1.1
--- /dev/null   Mon Jan 29 11:52:11 2018
+++ pkgsrc/sysutils/memtestplus/patches/patch-controller.c      Mon Jan 29 11:52:10 2018
@@ -0,0 +1,43 @@
+$NetBSD: patch-controller.c,v 1.1 2018/01/29 11:52:10 maya Exp $
+
+Avoid explicit out of bound read (undefined behaviour)
+fix whitespace
+
+--- controller.c.orig  2013-08-10 02:01:58.000000000 +0000
++++ controller.c
+@@ -292,15 +292,15 @@ static void setup_nhm(void)
+ 
+       /* First, locate the PCI bus where the MCH is located */
+ 
+-      for(i = 0; i < sizeof(possible_nhm_bus); i++) {
++      for(i = 0; i < sizeof(possible_nhm_bus)/sizeof(possible_nhm_bus[0]); i++) {
+               pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
+               pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
+               vid &= 0xFFFF;
+               did &= 0xFF00;
+               if(vid == 0x8086 && did >= 0x2C00) { 
+                       nhm_bus = possible_nhm_bus[i]; 
+-                      }
+-}
++              }
++      }
+ 
+       /* Now, we have the last IMC bus number in nhm_bus */
+       /* Check for ECC & Scrub */
+@@ -327,14 +327,14 @@ static void setup_nhm32(void)
+       ctrl.mode = ECC_NONE;
+ 
+       /* First, locate the PCI bus where the MCH is located */
+-      for(i = 0; i < sizeof(possible_nhm_bus); i++) {
++      for(i = 0; i < sizeof(possible_nhm_bus) / sizeof(possible_nhm_bus[0]); i++) {
+               pci_conf_read( possible_nhm_bus[i], 3, 4, 0x00, 2, &vid);
+               pci_conf_read( possible_nhm_bus[i], 3, 4, 0x02, 2, &did);
+               vid &= 0xFFFF;
+               did &= 0xFF00;
+               if(vid == 0x8086 && did >= 0x2C00) { 
+                       nhm_bus = possible_nhm_bus[i]; 
+-                      }
++              }
+       }
+ 
+       /* Now, we have the last IMC bus number in nhm_bus */