date:20170308

CVS commit: src/sys/external/bsd/drm2/ttm

2017-03-08 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Thu Mar  9 07:55:23 UTC 2017

Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bus_dma.c

Log Message:
Restore unpopulated state on fail1 error path. I shouldn't have committed
it separately.

from riastradh@


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/external/bsd/drm2/ttm/ttm_bus_dma.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/external/bsd/drm2/ttm/ttm_bus_dma.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.4 src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.5
--- src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.4	Thu Mar  9 07:50:50 2017
+++ src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c	Thu Mar  9 07:55:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ttm_bus_dma.c,v 1.4 2017/03/09 07:50:50 maya Exp $	*/
+/*	$NetBSD: ttm_bus_dma.c,v 1.5 2017/03/09 07:55:23 maya Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.4 2017/03/09 07:50:50 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.5 2017/03/09 07:55:23 maya Exp $");
 
 #include 
 
@@ -86,7 +86,9 @@ ttm_bus_dma_populate(struct ttm_dma_tt *
 
 fail2: __unused
 	bus_dmamap_unload(ttm_dma->ttm.bdev->dmat, ttm_dma->dma_address);
-fail1:	ttm_tt_unwire(_dma->ttm);
+fail1:	KASSERT(ttm->state == tt_unbound);
+	ttm_tt_unwire(_dma->ttm);
+	ttm->state = tt_unpopulated;
 fail0:	KASSERT(ret);
 	return ret;
 }

CVS commit: src/sys/external/bsd/drm2/ttm

2017-03-08 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Thu Mar  9 07:50:50 UTC 2017

Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bus_dma.c

Log Message:
Remove redundant handling for tt_unbound case, and assert that it is the
unpopulated case.

All callers of ttm_bus_dma_populate (ttm_agp_tt_populate,
radeon_ttm_tt_populate, nouveau_ttm_tt_populate) return early if it isn't
unpopulated.

from riastradh@


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/external/bsd/drm2/ttm/ttm_bus_dma.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/external/bsd/drm2/ttm/ttm_bus_dma.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.3 src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.4
--- src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.3	Thu Mar  9 07:42:36 2017
+++ src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c	Thu Mar  9 07:50:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ttm_bus_dma.c,v 1.3 2017/03/09 07:42:36 maya Exp $	*/
+/*	$NetBSD: ttm_bus_dma.c,v 1.4 2017/03/09 07:50:50 maya Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.3 2017/03/09 07:42:36 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.4 2017/03/09 07:50:50 maya Exp $");
 
 #include 
 
@@ -55,23 +55,12 @@ ttm_bus_dma_populate(struct ttm_dma_tt *
 {
 	int ret;
 
-	KASSERT(ttm_dma->ttm.state != tt_bound);
+	KASSERT(ttm_dma->ttm.state == tt_unpopulated);
 
-	/* Check the current state.  */
-	if (ttm_dma->ttm.state == tt_unbound) {
-		/*
-		 * If it's populated, then if the pages are wired and
-		 * loaded already, nothing to do.
-		 */
-		if (!ISSET(ttm_dma->ttm.page_flags, TTM_PAGE_FLAG_SWAPPED))
-			return 0;
-	} else if (ttm_dma->ttm.state == tt_unpopulated) {
-		/* If it's unpopulated, it can't be swapped.  */
-		KASSERT(!ISSET(ttm_dma->ttm.page_flags,
-			TTM_PAGE_FLAG_SWAPPED));
-		/* Pretend it is now, for the sake of ttm_tt_wire.  */
-		ttm_dma->ttm.page_flags |= TTM_PAGE_FLAG_SWAPPED;
-	}
+	/* If it's unpopulated, it can't be swapped.  */
+	KASSERT(!ISSET(ttm_dma->ttm.page_flags, TTM_PAGE_FLAG_SWAPPED));
+	/* Pretend it is now, for the sake of ttm_tt_wire.  */
+	ttm_dma->ttm.page_flags |= TTM_PAGE_FLAG_SWAPPED;
 
 	/* Wire the uvm pages and fill the ttm page array.  */
 	ret = ttm_tt_wire(_dma->ttm);

CVS commit: src/sys/external/bsd/drm2/ttm

2017-03-08 Thread Maya Rashish

Module Name:src
Committed By:   maya
Date:   Thu Mar  9 07:42:36 UTC 2017

Modified Files:
src/sys/external/bsd/drm2/ttm: ttm_bus_dma.c

Log Message:
Mark the state as unbound a bit earlier, to avoid triggering an assert in
the fail1 error path.

PR kern/52048: radeondrmkms: ttm->state == tt_unbound assertion


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/external/bsd/drm2/ttm/ttm_bus_dma.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/external/bsd/drm2/ttm/ttm_bus_dma.c
diff -u src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.2 src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.3
--- src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c:1.2	Sun Apr 24 04:26:12 2016
+++ src/sys/external/bsd/drm2/ttm/ttm_bus_dma.c	Thu Mar  9 07:42:36 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: ttm_bus_dma.c,v 1.2 2016/04/24 04:26:12 riastradh Exp $	*/
+/*	$NetBSD: ttm_bus_dma.c,v 1.3 2017/03/09 07:42:36 maya Exp $	*/
 
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.2 2016/04/24 04:26:12 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ttm_bus_dma.c,v 1.3 2017/03/09 07:42:36 maya Exp $");
 
 #include 
 
@@ -78,6 +78,9 @@ ttm_bus_dma_populate(struct ttm_dma_tt *
 	if (ret)
 		goto fail0;
 
+	/* Mark it populated but unbound.  */
+	ttm_dma->ttm.state = tt_unbound;
+
 	/* Load the DMA map.  */
 	/* XXX errno NetBSD->Linux */
 	ret = -bus_dmamap_load_pglist(ttm_dma->ttm.bdev->dmat,
@@ -89,9 +92,6 @@ ttm_bus_dma_populate(struct ttm_dma_tt *
 	/* Mark it wired.  */
 	ttm_dma->ttm.page_flags &= ~TTM_PAGE_FLAG_SWAPPED;
 
-	/* Mark it populated but unbound.  */
-	ttm_dma->ttm.state = tt_unbound;
-
 	/* Success!  */
 	return 0;

CVS commit: [netbsd-7] src/doc

2017-03-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Mar  9 06:33:12 UTC 2017

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
1370-1372


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.160 -r1.1.2.161 src/doc/CHANGES-7.1

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.160 src/doc/CHANGES-7.1:1.1.2.161
--- src/doc/CHANGES-7.1:1.1.2.160	Wed Mar  8 14:22:55 2017
+++ src/doc/CHANGES-7.1	Thu Mar  9 06:33:12 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.160 2017/03/08 14:22:55 martin Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.161 2017/03/09 06:33:12 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -8947,3 +8947,30 @@ external/mit/xorg/server/xorg-server/os/
 	MIT-MAGIC-COOKIES, fixing CVE-2017-2624
 	[mrg, ticket #1381]
 
+sys/dev/pci/ixgbe/ixgbe.c			1.60
+
+	Use 64bit DMA tag. If not, a lot of bounce buffer is allocated.
+	PR 49968.
+	[msaitoh, ticket #1370]
+
+sys/dev/mii/miidevs1.125
+
+	Add some Intel devices.
+	[msaitoh, ticket #1371]
+
+sys/dev/pci/if_wm.c1.462, 1.464-1.465 1.474 via patch
+sys/dev/pci/if_wmreg.h1.97
+sys/dev/pci/if_wmvar.h1.33 
+
+	wm(4):
+- Set IPV6EXDIS bit in RFCTL register because of an Errata on
+	  82575 and newer devices.  
+- Linux and FreeBSD defines 0x10f5 as E1000_DEV_ID_ICH9_IGP_M_AMT.
+	  In reality, This is not IGP but BM. Add new case to identify PHY
+	  type correctly on this device. Fixes PR#51924 reported by Jarle
+	  Greipsland. 
+- Use new wm_gmii_setup_phytype() function to setup sc_phytype and
+  mii_{read|write}reg. This change improves detection of PHY type.
+- Fix typo in comment.
+	[msaitoh, ticket #1372]
+

CVS commit: [netbsd-7] src/sys/dev/pci

2017-03-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Mar  9 06:28:36 UTC 2017

Modified Files:
src/sys/dev/pci [netbsd-7]: if_wm.c if_wmreg.h if_wmvar.h

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1372):
sys/dev/pci/if_wm.c: revisions 1.462, 1.464-1.465 1.474 via patch
sys/dev/pci/if_wmreg.h: revision 1.97
sys/dev/pci/if_wmvar.h: revision 1.33
- Set IPV6EXDIS bit in RFCTL register because of an Errata on 82575 and
  newer devices.
- Linux and FreeBSD defines 0x10f5 as E1000_DEV_ID_ICH9_IGP_M_AMT. In
  reality, This is not IGP but BM. Add new case to identify PHY type
  device. Fixes PR#51924 reported byJarle Greipsland.
- Use new wm_gmii_setup_phytype() function to setup sc_phytype and
  mii_{read|write}reg. This change improves detection of PHY type.
- Fix typo in comment.


To generate a diff of this commit:
cvs rdiff -u -r1.289.2.12 -r1.289.2.13 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.60.2.7 -r1.60.2.8 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.19.2.5 -r1.19.2.6 src/sys/dev/pci/if_wmvar.h

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

Modified files:

Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.289.2.12 src/sys/dev/pci/if_wm.c:1.289.2.13
--- src/sys/dev/pci/if_wm.c:1.289.2.12	Sun Dec 18 07:53:08 2016
+++ src/sys/dev/pci/if_wm.c	Thu Mar  9 06:28:36 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.289.2.12 2016/12/18 07:53:08 snj Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.289.2.13 2017/03/09 06:28:36 snj Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.12 2016/12/18 07:53:08 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.289.2.13 2017/03/09 06:28:36 snj Exp $");
 
 #include 
 #include 
@@ -638,6 +638,7 @@ static int	wm_intr(void *);
 static void	wm_tbi_serdes_set_linkled(struct wm_softc *);
 /* GMII related */
 static void	wm_gmii_reset(struct wm_softc *);
+static void	wm_gmii_setup_phytype(struct wm_softc *sc, uint32_t, uint16_t);
 static int	wm_get_phy_id_82575(struct wm_softc *);
 static void	wm_gmii_mediainit(struct wm_softc *, pci_product_id_t);
 static int	wm_gmii_mediachange(struct ifnet *);
@@ -3670,11 +3671,11 @@ wm_initialize_hardware_bits(struct wm_so
 		}
 		CSR_WRITE(sc, WMREG_TARC0, tarc0);
 
+		switch (sc->sc_type) {
 		/*
-		 * 8257[12] Errata No.52 and some others.
+		 * 8257[12] Errata No.52, 82573 Errata No.43 and some others.
 		 * Avoid RSS Hash Value bug.
 		 */
-		switch (sc->sc_type) {
 		case WM_T_82571:
 		case WM_T_82572:
 		case WM_T_82573:
@@ -3687,6 +3688,20 @@ wm_initialize_hardware_bits(struct wm_so
 		default:
 			break;
 		}
+	} else if ((sc->sc_type >= WM_T_82575) && (sc->sc_type <= WM_T_I211)) {
+		/*
+		 * 82575 Errata XXX, 82576 Errata 46, 82580 Errata 24,
+		 * I350 Errata 37, I210 Errata No. 31 and I211 Errata No. 11:
+		 * "Certain Malformed IPv6 Extension Headers are Not Processed
+		 * Correctly by the Device"
+		 *
+		 * I354(C2000) Errata AVR53:
+		 * "Malformed IPv6 Extension Headers May Result in LAN Device
+		 * Hang"
+		 */
+		reg = CSR_READ(sc, WMREG_RFCTL);
+		reg |= WMREG_RFCTL_IPV6EXDIS;
+		CSR_WRITE(sc, WMREG_RFCTL, reg);
 	}
 }
 
@@ -6798,6 +6813,251 @@ wm_gmii_reset(struct wm_softc *sc)
 }
 
 /*
+ * Setup sc_phytype and mii_{read|write}reg.
+ *
+ *  To identify PHY type, correct read/write function should be selected.
+ * To select correct read/write function, PCI ID or MAC type are required
+ * without accessing PHY registers.
+ *
+ *  On the first call of this function, PHY ID is not known yet. Check
+ * PCI ID or MAC type. The list of the PCI ID may not be perfect, so the
+ * result might be incorrect.
+ *
+ *  In the second call, PHY OUI and model is used to identify PHY type.
+ * It might not be perfpect because of the lack of compared entry, but it
+ * would be better than the first call.
+ *
+ *  If the detected new result and previous assumption is different,
+ * diagnous message will be printed.
+ */
+static void
+wm_gmii_setup_phytype(struct wm_softc *sc, uint32_t phy_oui,
+uint16_t phy_model)
+{
+	device_t dev = sc->sc_dev;
+	struct mii_data *mii = >sc_mii;
+	uint16_t new_phytype = WMPHY_UNKNOWN;
+	uint16_t doubt_phytype = WMPHY_UNKNOWN;
+	mii_readreg_t new_readreg;
+	mii_writereg_t new_writereg;
+
+	if (mii->mii_readreg == NULL) {
+		/*
+		 *  This is the first call of this function. For ICH and PCH
+		 * variants, it's difficult to determine the PHY access method
+		 * by sc_type, so use the PCI product ID for some devices.
+		 */
+
+		switch (sc->sc_pcidevid) {
+		case PCI_PRODUCT_INTEL_PCH_M_LM:
+		case PCI_PRODUCT_INTEL_PCH_M_LC:
+			/* 82577 */
+			new_phytype = WMPHY_82577;
+			break;
+		case PCI_PRODUCT_INTEL_PCH_D_DM:
+		case PCI_PRODUCT_INTEL_PCH_D_DC:
+			/* 82578 */
+			new_phytype = WMPHY_82578;
+			break;
+		case PCI_PRODUCT_INTEL_PCH2_LV_LM:
+		case

CVS commit: [netbsd-7] src/sys/dev/mii

2017-03-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Mar  9 06:26:04 UTC 2017

Modified Files:
src/sys/dev/mii [netbsd-7]: miidevs

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1371):
sys/dev/mii/miidevs: revision 1.125
Add some Intel devices.


To generate a diff of this commit:
cvs rdiff -u -r1.120.2.2 -r1.120.2.3 src/sys/dev/mii/miidevs

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

Modified files:

Index: src/sys/dev/mii/miidevs
diff -u src/sys/dev/mii/miidevs:1.120.2.2 src/sys/dev/mii/miidevs:1.120.2.3
--- src/sys/dev/mii/miidevs:1.120.2.2	Fri Dec  9 05:23:31 2016
+++ src/sys/dev/mii/miidevs	Thu Mar  9 06:26:04 2017
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.120.2.2 2016/12/09 05:23:31 snj Exp $
+$NetBSD: miidevs,v 1.120.2.3 2017/03/09 06:26:04 snj Exp $
 
 /*-
  * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -227,14 +227,17 @@ model yyINTEL I82562G		0x0031 i82562G 10
 model yyINTEL I82562EM		0x0032 i82562EM 10/100 media interface
 model yyINTEL I82562ET		0x0033 i82562ET 10/100 media interface
 model yyINTEL I82553		0x0035 i82553 10/100 media interface
+model yyINTEL IGP01E1000	0x0038 Intel IGP01E1000 Gigabit PHY
 model yyINTEL I82566		0x0039 i82566 10/100/1000 media interface
 model INTEL I82577		0x0005 i82577 10/100/1000 media interface
 model INTEL I82579		0x0009 i82579 10/100/1000 media interface
 model INTEL I217		0x000a i217 10/100/1000 media interface
+model INTEL I82580		0x003a 82580 10/100/1000 media interface
+model INTEL I350		0x003b I350 10/100/1000 media interface
 model xxMARVELL I210		0x I210 10/100/1000 media interface
 model xxMARVELL I82563		0x000a i82563 10/100/1000 media interface
+model ATHEROS I82578		0x0004 Intel 82578 10/100/1000 media interface
 
-model yyINTEL IGP01E1000	0x0038 Intel IGP01E1000 Gigabit PHY
 
 /* JMicron PHYs */
 model JMICRON JMC250		0x0021 JMC250 10/100/1000 media interface
@@ -262,7 +265,9 @@ model xxMARVELL E1149		0x000b Marvell 88
 model xxMARVELL E		0x000c Marvell 88E Gigabit PHY
 model xxMARVELL E1145		0x000d Marvell 88E1145 Quad Gigabit PHY
 model xxMARVELL E6060		0x0010 Marvell 88E6060 6-Port 10/100 Fast Ethernet Switch
+model xxMARVELL I347		0x001c Intel I347-AT4 Gigabit PHY
 model xxMARVELL E1512		0x001d Marvell 88E1512 Gigabit PHY
+model xxMARVELL E1340M		0x001f Marvell 88E1340 Gigabit PHY
 model xxMARVELL E1116		0x0021 Marvell 88E1116 Gigabit PHY
 model xxMARVELL E1118		0x0022 Marvell 88E1118 Gigabit PHY
 model xxMARVELL E1116R		0x0024 Marvell 88E1116R Gigabit PHY

CVS commit: src/doc

2017-03-08 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Mar  9 06:21:54 UTC 2017

Modified Files:
src/doc: TODO.smpnet

Log Message:
Tidy up again


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/doc/TODO.smpnet

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

Modified files:

Index: src/doc/TODO.smpnet
diff -u src/doc/TODO.smpnet:1.6 src/doc/TODO.smpnet:1.7
--- src/doc/TODO.smpnet:1.6	Wed Mar  8 07:32:58 2017
+++ src/doc/TODO.smpnet	Thu Mar  9 06:21:54 2017
@@ -1,30 +1,36 @@
-$NetBSD: TODO.smpnet,v 1.6 2017/03/08 07:32:58 ozaki-r Exp $
+$NetBSD: TODO.smpnet,v 1.7 2017/03/09 06:21:54 ozaki-r Exp $
 
 MP-safe components
 ==
 
- - bridge(4)
-   - STP
- - bpf(4)
- - gif(4)
- - l2tp(4)
- - npf(7)
- - pfil(9)
- - pppoe(4)
-   - if_spppsubr.c
- - tun(4)
- - vioif(4)
- - vmx(4)
- - wm(4)
-
- - Layer 2 (only Ethernet)
-   - if_ethersubr.c
- - Most Layer 3
+ - Device drivers
+   - vioif(4)
+   - vmx(4)
+   - wm(4)
+ - Layer 2
+   - Ethernet (if_ethersubr.c)
+   - bridge(4)
+ - STP
+   - Fast forward (ipflow)
+ - Layer 3
+   - All except for items in the below section
+ - Interfaces
+   - gif(4)
+   - l2tp(4)
+   - pppoe(4)
+ - if_spppsubr.c
+   - tun(4)
+ - Packet filters
+   - npf(7)
+ - Others
+   - bpf(4)
+   - pfil(9)
 
 Non MP-safe components and kernel options
 =
 
- - Most network device drivers
+ - Device drivers
+   - Most drivers other than ones listed in the above section
  - Layer 2
- ARCNET (if_arcsubr.c)
- ATM (if_atmsubr.c)

CVS commit: [netbsd-7] src/sys/dev/pci/ixgbe

2017-03-08 Thread Soren Jacobsen

Module Name:src
Committed By:   snj
Date:   Thu Mar  9 06:19:37 UTC 2017

Modified Files:
src/sys/dev/pci/ixgbe [netbsd-7]: ixgbe.c

Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #1370):
sys/dev/pci/ixgbe/ixgbe.c: revision 1.60
  Use 64bit DMA tag. If not, a lot of bounce buffer is allocated.
Fixes PR#49968 reported by Hauke.


To generate a diff of this commit:
cvs rdiff -u -r1.14.2.6 -r1.14.2.7 src/sys/dev/pci/ixgbe/ixgbe.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/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.14.2.6 src/sys/dev/pci/ixgbe/ixgbe.c:1.14.2.7
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.14.2.6	Tue Jun 14 08:42:34 2016
+++ src/sys/dev/pci/ixgbe/ixgbe.c	Thu Mar  9 06:19:37 2017
@@ -59,7 +59,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 /*$FreeBSD: head/sys/dev/ixgbe/ixgbe.c 279805 2015-03-09 10:29:15Z araujo $*/
-/*$NetBSD: ixgbe.c,v 1.14.2.6 2016/06/14 08:42:34 snj Exp $*/
+/*$NetBSD: ixgbe.c,v 1.14.2.7 2017/03/09 06:19:37 snj Exp $*/
 
 #include "opt_inet.h"
 #include "opt_inet6.h"
@@ -522,7 +522,10 @@ ixgbe_attach(device_t parent, device_t d
 	hw = >hw;
 	adapter->osdep.pc = pa->pa_pc;
 	adapter->osdep.tag = pa->pa_tag;
-	adapter->osdep.dmat = pa->pa_dmat;
+	if (pci_dma64_available(pa))
+		adapter->osdep.dmat = pa->pa_dmat64;
+	else
+		adapter->osdep.dmat = pa->pa_dmat;
 	adapter->osdep.attached = false;
 
 	ent = ixgbe_lookup(pa);

CVS commit: src/sys/net

2017-03-08 Thread Ryota Ozaki

Module Name:src
Committed By:   ozaki-r
Date:   Thu Mar  9 04:37:23 UTC 2017

Modified Files:
src/sys/net: bridgestp.c

Log Message:
Remove unnecessary splnet


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/net/bridgestp.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/net/bridgestp.c
diff -u src/sys/net/bridgestp.c:1.23 src/sys/net/bridgestp.c:1.24
--- src/sys/net/bridgestp.c:1.23	Fri Jun 10 13:27:15 2016
+++ src/sys/net/bridgestp.c	Thu Mar  9 04:37:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: bridgestp.c,v 1.23 2016/06/10 13:27:15 ozaki-r Exp $	*/
+/*	$NetBSD: bridgestp.c,v 1.24 2017/03/09 04:37:23 ozaki-r Exp $	*/
 
 /*
  * Copyright (c) 2000 Jason L. Wright (ja...@thought.net)
@@ -40,7 +40,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: bridgestp.c,v 1.23 2016/06/10 13:27:15 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: bridgestp.c,v 1.24 2017/03/09 04:37:23 ozaki-r Exp $");
 
 #include 
 #include 
@@ -219,7 +219,6 @@ bstp_send_config_bpdu(struct bridge_soft
 	struct mbuf *m;
 	struct ether_header *eh;
 	struct bstp_cbpdu bpdu;
-	int s;
 
 	KASSERT(BRIDGE_LOCKED(sc));
 
@@ -277,9 +276,7 @@ bstp_send_config_bpdu(struct bridge_soft
 	memcpy(mtod(m, char *) + sizeof(*eh), , sizeof(bpdu));
 
 	BRIDGE_UNLOCK(sc);
-	s = splnet();
 	bridge_enqueue(sc, ifp, m, 0);
-	splx(s);
 	BRIDGE_LOCK(sc);
 }
 
@@ -365,7 +362,6 @@ bstp_transmit_tcn(struct bridge_softc *s
 	struct ifnet *ifp;
 	struct ether_header *eh;
 	struct mbuf *m;
-	int s;
 
 	KASSERT(BRIDGE_LOCKED(sc));
 
@@ -397,9 +393,7 @@ bstp_transmit_tcn(struct bridge_softc *s
 	memcpy(mtod(m, char *) + sizeof(*eh), , sizeof(bpdu));
 
 	BRIDGE_UNLOCK(sc);
-	s = splnet();
 	bridge_enqueue(sc, ifp, m, 0);
-	splx(s);
 	BRIDGE_LOCK(sc);
 }
 
@@ -1062,9 +1056,7 @@ bstp_tick(void *arg)
 {
 	struct bridge_softc *sc = arg;
 	struct bridge_iflist *bif;
-	int s;
 
-	s = splnet();
 	BRIDGE_LOCK(sc);
 
 	BRIDGE_IFLIST_WRITER_FOREACH(bif, sc) {
@@ -1114,7 +1106,6 @@ bstp_tick(void *arg)
 		callout_reset(>sc_bstpcallout, hz, bstp_tick, sc);
 
 	BRIDGE_UNLOCK(sc);
-	splx(s);
 }
 
 static void

CVS commit: src/libexec/ld.elf_so

2017-03-08 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Thu Mar  9 00:43:50 UTC 2017

Modified Files:
src/libexec/ld.elf_so: map_object.c

Log Message:
really unmap the gap between the text and data rather than just removing
all access with mprotect().  the latter results in the kernel having to
keep track of that range separately since the permissions are different.
avoid calling mmap() with a size of zero.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/libexec/ld.elf_so/map_object.c

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

Modified files:

Index: src/libexec/ld.elf_so/map_object.c
diff -u src/libexec/ld.elf_so/map_object.c:1.55 src/libexec/ld.elf_so/map_object.c:1.56
--- src/libexec/ld.elf_so/map_object.c:1.55	Thu Jun 16 11:34:13 2016
+++ src/libexec/ld.elf_so/map_object.c	Thu Mar  9 00:43:50 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: map_object.c,v 1.55 2016/06/16 11:34:13 christos Exp $	 */
+/*	$NetBSD: map_object.c,v 1.56 2017/03/09 00:43:50 chs Exp $	 */
 
 /*
  * Copyright 1996 John D. Polstra.
@@ -34,7 +34,7 @@
 
 #include 
 #ifndef lint
-__RCSID("$NetBSD: map_object.c,v 1.55 2016/06/16 11:34:13 christos Exp $");
+__RCSID("$NetBSD: map_object.c,v 1.56 2017/03/09 00:43:50 chs Exp $");
 #endif /* not lint */
 
 #include 
@@ -88,8 +88,10 @@ _rtld_map_object(const char *path, int f
 	Elf_Off		 data_offset;
 	Elf_Addr	 data_vaddr;
 	Elf_Addr	 data_vlimit;
+	size_t		 data_size;
 	int		 data_flags;
 	caddr_t		 data_addr;
+	size_t		 bss_size;
 #if defined(__HAVE_TLS_VARIANT_I) || defined(__HAVE_TLS_VARIANT_II)
 	Elf_Addr	 tls_vaddr = 0; /* Noise GCC */
 #endif
@@ -361,7 +363,8 @@ _rtld_map_object(const char *path, int f
 
 	/* Overlay the data segment onto the proper region. */
 	data_addr = mapbase + (data_vaddr - base_vaddr);
-	if (mmap(data_addr, data_vlimit - data_vaddr, data_flags,
+	data_size = data_vlimit - data_vaddr;
+	if (data_size != 0 && mmap(data_addr, data_size, data_flags,
 	MAP_FILE | MAP_PRIVATE | MAP_FIXED, fd, data_offset) ==
 	MAP_FAILED) {
 		_rtld_error("mmap of data failed: %s", xstrerror(errno));
@@ -369,7 +372,8 @@ _rtld_map_object(const char *path, int f
 	}
 
 	/* Overlay the bss segment onto the proper region. */
-	if (mmap(mapbase + data_vlimit - base_vaddr, base_vlimit - data_vlimit,
+	bss_size = base_vlimit - data_vlimit;
+	if (bss_size != 0 && mmap(mapbase + data_vlimit - base_vaddr, bss_size,
 	data_flags, MAP_ANON | MAP_PRIVATE | MAP_FIXED, -1, 0) ==
 	MAP_FAILED) {
 		_rtld_error("mmap of bss failed: %s", xstrerror(errno));
@@ -379,8 +383,8 @@ _rtld_map_object(const char *path, int f
 	/* Unmap the gap between the text and data. */
 	gap_addr = mapbase + round_up(text_vlimit - base_vaddr);
 	gap_size = data_addr - gap_addr;
-	if (gap_size != 0 && mprotect(gap_addr, gap_size, PROT_NONE) == -1) {
-		_rtld_error("mprotect of text -> data gap failed: %s",
+	if (gap_size != 0 && munmap(gap_addr, gap_size) == -1) {
+		_rtld_error("munmap of text -> data gap failed: %s",
 		xstrerror(errno));
 		goto bad;
 	}

CVS commit: src/sys/arch/x86/x86

2017-03-08 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Thu Mar  9 00:21:55 UTC 2017

Modified Files:
src/sys/arch/x86/x86: pmap.c

Log Message:
in pmap_get_ptp(), if we need to allocate multiple new ptp levels
and succeed in allocating some pages but fail to get them all,
free any ptps we did allocate before returning.
also, only consume kernel-reserve pages if pmap_enter()
is called without PMAP_CANFAIL set, to help avoid deadlocking
during high memory pressure.


To generate a diff of this commit:
cvs rdiff -u -r1.241 -r1.242 src/sys/arch/x86/x86/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/x86/x86/pmap.c
diff -u src/sys/arch/x86/x86/pmap.c:1.241 src/sys/arch/x86/x86/pmap.c:1.242
--- src/sys/arch/x86/x86/pmap.c:1.241	Sun Mar  5 08:36:35 2017
+++ src/sys/arch/x86/x86/pmap.c	Thu Mar  9 00:21:55 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.241 2017/03/05 08:36:35 maxv Exp $	*/
+/*	$NetBSD: pmap.c,v 1.242 2017/03/09 00:21:55 chs Exp $	*/
 
 /*-
  * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc.
@@ -171,7 +171,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.241 2017/03/05 08:36:35 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.242 2017/03/09 00:21:55 chs Exp $");
 
 #include "opt_user_ldt.h"
 #include "opt_lockdebug.h"
@@ -551,7 +551,7 @@ static void pmap_remap_largepages(void);
 #endif
 
 static struct vm_page *pmap_get_ptp(struct pmap *, vaddr_t,
-pd_entry_t * const *);
+pd_entry_t * const *, int);
 static struct vm_page *pmap_find_ptp(struct pmap *, vaddr_t, paddr_t, int);
 static void pmap_freepage(struct pmap *, struct vm_page *, int);
 static void pmap_free_ptp(struct pmap *, struct vm_page *, vaddr_t,
@@ -1966,51 +1966,61 @@ pmap_free_ptp(struct pmap *pmap, struct 
  */
 
 static struct vm_page *
-pmap_get_ptp(struct pmap *pmap, vaddr_t va, pd_entry_t * const *pdes)
+pmap_get_ptp(struct pmap *pmap, vaddr_t va, pd_entry_t * const *pdes, int flags)
 {
-	struct vm_page *ptp, *pptp;
-	int i;
+	struct vm_page *ptp;
+	struct {
+		struct vm_page *pg;
+		bool new;
+	} pt[PTP_LEVELS + 1];
+	int i, aflags;
 	unsigned long index;
 	pd_entry_t *pva;
-	paddr_t ppa, pa;
+	paddr_t pa;
 	struct uvm_object *obj;
+	voff_t off;
 
 	KASSERT(pmap != pmap_kernel());
 	KASSERT(mutex_owned(pmap->pm_lock));
 	KASSERT(kpreempt_disabled());
 
-	ptp = NULL;
-	pa = (paddr_t)-1;
-
 	/*
-	 * Loop through all page table levels seeing if we need to
-	 * add a new page to that level.
+	 * Loop through all page table levels allocating a page
+	 * for any level where we don't already have one.
 	 */
+	memset(pt, 0, sizeof(pt));
+	aflags = ((flags & PMAP_CANFAIL) ? 0 : UVM_PGA_USERESERVE) |
+		UVM_PGA_ZERO;
 	for (i = PTP_LEVELS; i > 1; i--) {
-		/*
-		 * Save values from previous round.
-		 */
-		pptp = ptp;
-		ppa = pa;
+		obj = >pm_obj[i - 2];
+		off = ptp_va2o(va, i - 1);
+
+		PMAP_SUBOBJ_LOCK(pmap, i - 2);
+		pt[i].pg = uvm_pagelookup(obj, off);
+		if (pt[i].pg == NULL) {
+			pt[i].pg = uvm_pagealloc(obj, off, NULL, aflags);
+			pt[i].new = true;
+		}
+		PMAP_SUBOBJ_UNLOCK(pmap, i - 2);
+
+		if (pt[i].pg == NULL)
+			goto fail;
+	}
 
+	/*
+	 * Now that we have all the pages looked up or allocated,
+	 * loop through again installing any new ones into the tree.
+	 */
+	for (i = PTP_LEVELS; i > 1; i--) {
 		index = pl_i(va, i);
 		pva = pdes[i - 2];
 
 		if (pmap_valid_entry(pva[index])) {
-			ppa = pmap_pte2pa(pva[index]);
-			ptp = NULL;
+			KASSERT(!pt[i].new);
 			continue;
 		}
 
-		obj = >pm_obj[i-2];
-		PMAP_SUBOBJ_LOCK(pmap, i - 2);
-		ptp = uvm_pagealloc(obj, ptp_va2o(va, i - 1), NULL,
-		UVM_PGA_USERESERVE|UVM_PGA_ZERO);
-		PMAP_SUBOBJ_UNLOCK(pmap, i - 2);
-
-		if (ptp == NULL)
-			return NULL;
-
+		ptp = pt[i].pg;
 		ptp->flags &= ~PG_BUSY; /* never busy */
 		ptp->wire_count = 1;
 		pmap->pm_ptphint[i - 2] = ptp;
@@ -2019,6 +2029,7 @@ pmap_get_ptp(struct pmap *pmap, vaddr_t 
 		(pmap_pa2pte(pa) | PG_u | PG_RW | PG_V));
 #if defined(XEN) && defined(__x86_64__)
 		if (i == PTP_LEVELS) {
+
 			/*
 			 * Update the per-cpu PD on all cpus the current
 			 * pmap is active on
@@ -2028,31 +2039,37 @@ pmap_get_ptp(struct pmap *pmap, vaddr_t 
 #endif
 		pmap_pte_flush();
 		pmap_stats_update(pmap, 1, 0);
+
 		/*
 		 * If we're not in the top level, increase the
 		 * wire count of the parent page.
 		 */
 		if (i < PTP_LEVELS) {
-			if (pptp == NULL) {
-pptp = pmap_find_ptp(pmap, va, ppa, i);
-KASSERT(pptp != NULL);
-			}
-			pptp->wire_count++;
+			pt[i + 1].pg->wire_count++;
 		}
 	}
+	ptp = pt[2].pg;
+	KASSERT(ptp != NULL);
+	pmap->pm_ptphint[0] = ptp;
+	return ptp;
 
 	/*
-	 * PTP is not NULL if we just allocated a new PTP.  If it is
-	 * still NULL, we must look up the existing one.
+	 * Allocation of a ptp failed, free any others that we just allocated.
 	 */
-	if (ptp == NULL) {
-		ptp = pmap_find_ptp(pmap, va, ppa, 1);
-		KASSERTMSG(ptp !=

CVS commit: src/sbin/disklabel

2017-03-08 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Thu Mar  9 00:18:23 UTC 2017

Modified Files:
src/sbin/disklabel: main.c

Log Message:
use warnx() rather than warn() in a case where errno is not relevant.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sbin/disklabel/main.c

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

Modified files:

Index: src/sbin/disklabel/main.c
diff -u src/sbin/disklabel/main.c:1.46 src/sbin/disklabel/main.c:1.47
--- src/sbin/disklabel/main.c:1.46	Sun Jan 31 18:57:29 2016
+++ src/sbin/disklabel/main.c	Thu Mar  9 00:18:23 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.46 2016/01/31 18:57:29 christos Exp $	*/
+/*	$NetBSD: main.c,v 1.47 2017/03/09 00:18:23 chs Exp $	*/
 
 /*
  * Copyright (c) 2006 The NetBSD Foundation, Inc.
@@ -76,7 +76,7 @@ __COPYRIGHT("@(#) Copyright (c) 1987, 19
 static char sccsid[] = "@(#)disklabel.c	8.4 (Berkeley) 5/4/95";
 /* from static char sccsid[] = "@(#)disklabel.c	1.2 (Symmetric) 11/28/85"; */
 #else
-__RCSID("$NetBSD: main.c,v 1.46 2016/01/31 18:57:29 christos Exp $");
+__RCSID("$NetBSD: main.c,v 1.47 2017/03/09 00:18:23 chs Exp $");
 #endif
 #endif	/* not lint */
 
@@ -387,7 +387,7 @@ setbyteorder(int new_byteorder)
 	if ((!biendian_p || set_p)
 	&& byteorder != 0
 	&& byteorder != new_byteorder) {
-		warn("changing %s byteorder to %s",
+		warnx("changing %s byteorder to %s",
 		byteorder == LITTLE_ENDIAN ? "le" : "be",
 		new_byteorder == LITTLE_ENDIAN ? "le" : "be");
 	}

CVS commit: src/share/man/man4

2017-03-08 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Thu Mar  9 00:17:32 UTC 2017

Modified Files:
src/share/man/man4: options.4

Log Message:
mention KDTRACE_HOOKS.


To generate a diff of this commit:
cvs rdiff -u -r1.463 -r1.464 src/share/man/man4/options.4

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

Modified files:

Index: src/share/man/man4/options.4
diff -u src/share/man/man4/options.4:1.463 src/share/man/man4/options.4:1.464
--- src/share/man/man4/options.4:1.463	Sun Feb 19 11:16:45 2017
+++ src/share/man/man4/options.4	Thu Mar  9 00:17:32 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: options.4,v 1.463 2017/02/19 11:16:45 wiz Exp $
+.\"	$NetBSD: options.4,v 1.464 2017/03/09 00:17:32 chs Exp $
 .\"
 .\" Copyright (c) 1996
 .\" 	Perry E. Metzger.  All rights reserved.
@@ -634,6 +634,12 @@ Functions for use in
 to check lock chains etc. are also enabled.
 These checks are very expensive and can decrease performance on
 multi-processor machines by a factor of three.
+.It Cd options KDTRACE_HOOKS
+Adds hooks for the DTrace tracing facility, which allows users to
+analyse many aspects of system and application behavior.
+See
+.Xr dtrace 1
+for details.
 .It Cd options KSTACK_CHECK_MAGIC
 Check kernel stack usage and panic if stack overflow is detected.
 This check is performance sensitive because it scans stack on each context

CVS commit: src/sys/arch/i386/i386

2017-03-08 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Thu Mar  9 00:16:51 UTC 2017

Modified Files:
src/sys/arch/i386/i386: trap.c

Log Message:
improve readability of TRAP_SIGDEBUG info.
also print the trapframe info like amd64 does.


To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/sys/arch/i386/i386/trap.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/i386/i386/trap.c
diff -u src/sys/arch/i386/i386/trap.c:1.284 src/sys/arch/i386/i386/trap.c:1.285
--- src/sys/arch/i386/i386/trap.c:1.284	Thu Feb 23 03:34:22 2017
+++ src/sys/arch/i386/i386/trap.c	Thu Mar  9 00:16:51 2017
@@ -1,5 +1,5 @@
 
-/*	$NetBSD: trap.c,v 1.284 2017/02/23 03:34:22 kamil Exp $	*/
+/*	$NetBSD: trap.c,v 1.285 2017/03/09 00:16:51 chs Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000, 2005, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.284 2017/02/23 03:34:22 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.285 2017/03/09 00:16:51 chs Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -125,7 +125,6 @@ dtrace_trap_func_t	dtrace_trap_func = NU
 dtrace_doubletrap_func_t	dtrace_doubletrap_func = NULL;
 #endif
 
-
 void trap(struct trapframe *);
 void trap_tss(struct i386tss *, int, int);
 void trap_return_fault_return(struct trapframe *) __dead;
@@ -161,6 +160,10 @@ int	trapdebug = 0;
 
 #define	IDTVEC(name)	__CONCAT(X, name)
 
+#ifdef TRAP_SIGDEBUG
+static void frame_dump(struct trapframe *, struct pcb *);
+#endif
+
 void
 trap_tss(struct i386tss *tss, int trapno, int code)
 {
@@ -224,8 +227,8 @@ trap_print(const struct trapframe *frame
 	}
 	printf(" in %s mode\n", (type & T_USER) ? "user" : "supervisor");
 
-	printf("trap type %d code %x eip %x cs %x eflags %x cr2 %lx "
-	"ilevel %x esp %x\n",
+	printf("trap type %d code %#x eip %#x cs %#x eflags %#x cr2 %#lx "
+	"ilevel %#x esp %#x\n",
 	type, frame->tf_err, frame->tf_eip, frame->tf_cs, frame->tf_eflags,
 	(long)rcr2(), curcpu()->ci_ilevel, frame->tf_esp);
 
@@ -673,7 +676,7 @@ faultcommon:
 		}
 
 #ifdef TRAP_SIGDEBUG
-		printf("pid %d.%d (%s): signal %d at eip %x addr %lx "
+		printf("pid %d.%d (%s): signal %d at eip %#x addr %#lx "
 		"error %d\n", p->p_pid, l->l_lid, p->p_comm, ksi.ksi_signo,
 		frame->tf_eip, va, error);
 #endif
@@ -768,3 +771,37 @@ startlwp(void *arg)
 	kmem_free(uc, sizeof(ucontext_t));
 	userret(l);
 }
+
+#ifdef TRAP_SIGDEBUG
+void
+frame_dump(struct trapframe *tf, struct pcb *pcb)
+{
+	int i;
+	unsigned long *p;
+	uint64_t fsd, gsd;
+
+	printf("trapframe %p\n", tf);
+	printf("eip 0x%08x  esp 0x%08x  efl 0x%08x\n",
+	tf->tf_eip, tf->tf_esp, tf->tf_eflags);
+	printf("edi 0x%08x  esi 0x%08x  edx 0x%08x\n",
+	tf->tf_edi, tf->tf_esi, tf->tf_edx);
+	printf("ecx 0x%08x\n",
+	tf->tf_ecx);
+	printf("ebp 0x%08x  ebx 0x%08x  eax 0x%08x\n",
+	tf->tf_ebp, tf->tf_ebx, tf->tf_eax);
+	printf("cs 0x%04x  ds 0x%04x  es 0x%04x  "
+	   "fs 0x%04x  gs 0x%04x  ss 0x%04x\n",
+		tf->tf_cs & 0x, tf->tf_ds & 0x, tf->tf_es & 0x,
+		tf->tf_fs & 0x, tf->tf_gs & 0x, tf->tf_ss & 0x);
+	memcpy(, >pcb_fsd, sizeof(fsd));
+	memcpy(, >pcb_gsd, sizeof(gsd));
+	printf("fsbase 0x%016llx gsbase 0x%016llx\n", fsd, gsd);
+	printf("\n");
+	printf("Stack dump:\n");
+	for (i = 0, p = (unsigned long *) tf; i < 20; i ++, p += 8)
+		printf(" 0x%.8lx 0x%.8lx 0x%.8lx 0x%.8lx"
+		   " 0x%.8lx 0x%.8lx 0x%.8lx 0x%.8lx\n",
+		   p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]);
+	printf("\n");
+}
+#endif

CVS commit: src/sys/arch/amd64/amd64

2017-03-08 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Thu Mar  9 00:16:07 UTC 2017

Modified Files:
src/sys/arch/amd64/amd64: trap.c

Log Message:
improve readability of TRAP_SIGDEBUG info and add fsbase/gsbase.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 src/sys/arch/amd64/amd64/trap.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/amd64/amd64/trap.c
diff -u src/sys/arch/amd64/amd64/trap.c:1.92 src/sys/arch/amd64/amd64/trap.c:1.93
--- src/sys/arch/amd64/amd64/trap.c:1.92	Thu Feb 23 03:34:22 2017
+++ src/sys/arch/amd64/amd64/trap.c	Thu Mar  9 00:16:07 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.92 2017/02/23 03:34:22 kamil Exp $	*/
+/*	$NetBSD: trap.c,v 1.93 2017/03/09 00:16:07 chs Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -68,7 +68,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.92 2017/02/23 03:34:22 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.93 2017/03/09 00:16:07 chs Exp $");
 
 #include "opt_ddb.h"
 #include "opt_kgdb.h"
@@ -154,7 +154,7 @@ int	trapdebug = 0;
 #define	IDTVEC(name)	__CONCAT(X, name)
 
 #ifdef TRAP_SIGDEBUG
-static void frame_dump(struct trapframe *);
+static void frame_dump(struct trapframe *, struct pcb *);
 #endif
 
 static void *
@@ -194,8 +194,8 @@ trap_print(const struct trapframe *frame
 	}
 	printf(" in %s mode\n", (type & T_USER) ? "user" : "supervisor");
 
-	printf("trap type %d code %lx rip %lx cs %lx rflags %lx cr2 %lx "
-	"ilevel %x rsp %lx\n",
+	printf("trap type %d code %#lx rip %#lx cs %#lx rflags %#lx cr2 %#lx "
+	"ilevel %#x rsp %#lx\n",
 	type, frame->tf_err, (u_long)frame->tf_rip, frame->tf_cs,
 	frame->tf_rflags, rcr2(), curcpu()->ci_ilevel, frame->tf_rsp);
 
@@ -408,9 +408,9 @@ kernelfault:
 	case T_STKFLT|T_USER:
 	case T_ALIGNFLT|T_USER:
 #ifdef TRAP_SIGDEBUG
-		printf("pid %d.%d (%s): BUS/SEGV (%x) at rip %lx addr %lx\n",
+		printf("pid %d.%d (%s): BUS/SEGV (%#x) at rip %#lx addr %#lx\n",
 		p->p_pid, l->l_lid, p->p_comm, type, frame->tf_rip, rcr2());
-		frame_dump(frame);
+		frame_dump(frame, pcb);
 #endif
 		KSI_INIT_TRAP();
 		ksi.ksi_trap = type & ~T_USER;
@@ -442,9 +442,9 @@ kernelfault:
 	case T_PRIVINFLT|T_USER:	/* privileged instruction fault */
 	case T_FPOPFLT|T_USER:		/* coprocessor operand fault */
 #ifdef TRAP_SIGDEBUG
-		printf("pid %d.%d (%s): ILL at rip %lx addr %lx\n",
+		printf("pid %d.%d (%s): ILL at rip %#lx addr %#lx\n",
 		p->p_pid, l->l_lid, p->p_comm, frame->tf_rip, rcr2());
-		frame_dump(frame);
+		frame_dump(frame, pcb);
 #endif
 		KSI_INIT_TRAP();
 		ksi.ksi_signo = SIGILL;
@@ -670,7 +670,7 @@ faultcommon:
 		"error %d trap %d cr2 %p\n", p->p_pid, l->l_lid, p->p_comm,
 		ksi.ksi_signo, frame->tf_rip, va, error, ksi.ksi_trap,
 		ksi.ksi_addr);
-		frame_dump(frame);
+		frame_dump(frame, pcb);
 #endif
 		(*p->p_emul->e_trapsignal)(l, );
 		break;
@@ -763,32 +763,36 @@ startlwp(void *arg)
 }
 
 #ifdef TRAP_SIGDEBUG
-static void
-frame_dump(struct trapframe *tf)
+void
+frame_dump(struct trapframe *tf, struct pcb *pcb)
 {
 	int i;
 	unsigned long *p;
 
-	printf("rip %p  rsp %p  rfl %p\n",
-	(void *)tf->tf_rip, (void *)tf->tf_rsp, (void *)tf->tf_rflags);
-	printf("rdi %p  rsi %p  rdx %p\n",
-	(void *)tf->tf_rdi, (void *)tf->tf_rsi, (void *)tf->tf_rdx);
-	printf("rcx %p  r8  %p  r9  %p\n",
-	(void *)tf->tf_rcx, (void *)tf->tf_r8, (void *)tf->tf_r9);
-	printf("r10 %p  r11 %p  r12 %p\n",
-	(void *)tf->tf_r10, (void *)tf->tf_r11, (void *)tf->tf_r12);
-	printf("r13 %p  r14 %p  r15 %p\n",
-	(void *)tf->tf_r13, (void *)tf->tf_r14, (void *)tf->tf_r15);
-	printf("rbp %p  rbx %p  rax %p\n",
-	(void *)tf->tf_rbp, (void *)tf->tf_rbx, (void *)tf->tf_rax);
-	printf("cs %lx  ds %lx  es %lx  fs %lx  gs %lx  ss %lx\n",
+	printf("trapframe %p\n", tf);
+	printf("rip 0x%016lx  rsp 0x%016lx  rfl 0x%016lx\n",
+	tf->tf_rip, tf->tf_rsp, tf->tf_rflags);
+	printf("rdi 0x%016lx  rsi 0x%016lx  rdx 0x%016lx\n",
+	tf->tf_rdi, tf->tf_rsi, tf->tf_rdx);
+	printf("rcx 0x%016lx  r8  0x%016lx  r9  0x%016lx\n",
+	tf->tf_rcx, tf->tf_r8, tf->tf_r9);
+	printf("r10 0x%016lx  r11 0x%016lx  r12 0x%016lx\n",
+	tf->tf_r10, tf->tf_r11, tf->tf_r12);
+	printf("r13 0x%016lx  r14 0x%016lx  r15 0x%016lx\n",
+	tf->tf_r13, tf->tf_r14, tf->tf_r15);
+	printf("rbp 0x%016lx  rbx 0x%016lx  rax 0x%016lx\n",
+	tf->tf_rbp, tf->tf_rbx, tf->tf_rax);
+	printf("cs 0x%04lx  ds 0x%04lx  es 0x%04lx  "
+	   "fs 0x%04lx  gs 0x%04lx  ss 0x%04lx\n",
 		tf->tf_cs & 0x, tf->tf_ds & 0x, tf->tf_es & 0x,
 		tf->tf_fs & 0x, tf->tf_gs & 0x, tf->tf_ss & 0x);
-
+	printf("fsbase 0x%016lx gsbase 0x%016lx\n",
+	   pcb->pcb_fs, pcb->pcb_gs);
 	printf("\n");
 	printf("Stack dump:\n");
 	for (i = 0, p = (unsigned long *) tf; i < 20; i ++, p += 4)
-		printf("   0x%.16lx  0x%.16lx  0x%.16lx 0x%.16lx\n", *p, p[1], p[2],

CVS commit: src/sys/arch/powerpc/powerpc

2017-03-08 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Thu Mar  9 00:15:06 UTC 2017

Modified Files:
src/sys/arch/powerpc/powerpc: trap.c

Log Message:
set signo and code correctly for signals triggered by uvm_fault() errors.


To generate a diff of this commit:
cvs rdiff -u -r1.151 -r1.152 src/sys/arch/powerpc/powerpc/trap.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/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.151 src/sys/arch/powerpc/powerpc/trap.c:1.152
--- src/sys/arch/powerpc/powerpc/trap.c:1.151	Mon Feb 27 06:54:00 2017
+++ src/sys/arch/powerpc/powerpc/trap.c	Thu Mar  9 00:15:06 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: trap.c,v 1.151 2017/02/27 06:54:00 chs Exp $	*/
+/*	$NetBSD: trap.c,v 1.152 2017/03/09 00:15:06 chs Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.151 2017/02/27 06:54:00 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.152 2017/03/09 00:15:06 chs Exp $");
 
 #include "opt_altivec.h"
 #include "opt_ddb.h"
@@ -262,18 +262,28 @@ trap(struct trapframe *tf)
 			tf->tf_dar, tf->tf_srr0, tf->tf_dsisr, rv);
 		}
 		KSI_INIT_TRAP();
-		ksi.ksi_signo = SIGSEGV;
 		ksi.ksi_trap = EXC_DSI;
 		ksi.ksi_addr = (void *)tf->tf_dar;
-		ksi.ksi_code =
-		(tf->tf_dsisr & DSISR_PROTECT ? SEGV_ACCERR : SEGV_MAPERR);
-		if (rv == ENOMEM) {
-			printf("UVM: pid %d.%d (%s), uid %d killed: "
-			   "out of swap\n",
-			   p->p_pid, l->l_lid, p->p_comm,
-			   l->l_cred ?
-			   kauth_cred_geteuid(l->l_cred) : -1);
+vm_signal:
+		switch (rv) {
+		case EINVAL:
+			ksi.ksi_signo = SIGBUS;
+			ksi.ksi_code = BUS_ADRERR;
+			break;
+		case EACCES:
+			ksi.ksi_signo = SIGSEGV;
+			ksi.ksi_code = SEGV_ACCERR;
+			break;
+		case ENOMEM:
 			ksi.ksi_signo = SIGKILL;
+			printf("UVM: pid %d.%d (%s), uid %d killed: "
+			   "out of swap\n", p->p_pid, l->l_lid, p->p_comm,
+			   l->l_cred ? kauth_cred_geteuid(l->l_cred) : -1);
+			break;
+		default:
+			ksi.ksi_signo = SIGSEGV;
+			ksi.ksi_code = SEGV_MAPERR;
+			break;
 		}
 		(*p->p_emul->e_trapsignal)(l, );
 		break;
@@ -323,12 +333,9 @@ trap(struct trapframe *tf)
 			tf->tf_srr0, tf->tf_srr1);
 		}
 		KSI_INIT_TRAP();
-		ksi.ksi_signo = SIGSEGV;
 		ksi.ksi_trap = EXC_ISI;
 		ksi.ksi_addr = (void *)tf->tf_srr0;
-		ksi.ksi_code = (rv == EACCES ? SEGV_ACCERR : SEGV_MAPERR);
-		(*p->p_emul->e_trapsignal)(l, );
-		break;
+		goto vm_signal;
 
 	case EXC_FPU|EXC_USER:
 		ci->ci_ev_fpu.ev_count++;

CVS commit: src/sys/arch/powerpc/powerpc

2017-03-08 Thread Chuck Silvers

Module Name:src
Committed By:   chs
Date:   Thu Mar  9 00:14:03 UTC 2017

Modified Files:
src/sys/arch/powerpc/powerpc: fpu.c

Log Message:
use kpreempt_disable() rather than splsoftclock() to disable preemption.


To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/sys/arch/powerpc/powerpc/fpu.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/powerpc/fpu.c
diff -u src/sys/arch/powerpc/powerpc/fpu.c:1.36 src/sys/arch/powerpc/powerpc/fpu.c:1.37
--- src/sys/arch/powerpc/powerpc/fpu.c:1.36	Mon Jul  6 01:55:50 2015
+++ src/sys/arch/powerpc/powerpc/fpu.c	Thu Mar  9 00:14:03 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: fpu.c,v 1.36 2015/07/06 01:55:50 matt Exp $	*/
+/*	$NetBSD: fpu.c,v 1.37 2017/03/09 00:14:03 chs Exp $	*/
 
 /*
  * Copyright (C) 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.36 2015/07/06 01:55:50 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.37 2017/03/09 00:14:03 chs Exp $");
 
 #include "opt_multiprocessor.h"
 
@@ -139,9 +139,10 @@ fpu_get_fault_code(void)
 	uint32_t fpscr, ofpscr;
 	int code;
 
-	int s = splsoftclock();	/* disable preemption */
+	kpreempt_disable();
 
 	struct cpu_info * const ci = curcpu();
+
 	/*
 	 * If we got preempted, we may be running on a different CPU.  So we
 	 * need to check for that.
@@ -180,7 +181,7 @@ fpu_get_fault_code(void)
 		((uint32_t *)>pcb_fpu.fpscr)[_QUAD_LOWWORD] &= ~MASKBITS;
 	}
 
-	splx(s);	/* allow preemption */
+	kpreempt_enable();
 
 	/*
 	 * Now determine the fault type.  First we test to see if any of sticky

CVS commit: src/distrib/sets/lists/comp

2017-03-08 Thread Robert Elz

Module Name:src
Committed By:   kre
Date:   Wed Mar  8 22:55:20 UTC 2017

Modified Files:
src/distrib/sets/lists/comp: md.i386

Log Message:
Do it properly.Thanks wiz.


To generate a diff of this commit:
cvs rdiff -u -r1.166 -r1.167 src/distrib/sets/lists/comp/md.i386

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

Modified files:

Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.166 src/distrib/sets/lists/comp/md.i386:1.167
--- src/distrib/sets/lists/comp/md.i386:1.166	Wed Mar  8 21:56:05 2017
+++ src/distrib/sets/lists/comp/md.i386	Wed Mar  8 22:55:20 2017
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.166 2017/03/08 21:56:05 kre Exp $
+# $NetBSD: md.i386,v 1.167 2017/03/08 22:55:20 kre Exp $
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/ammintrin.h		comp-obsolete		obsolete
@@ -412,7 +412,7 @@
 ./usr/include/ieeefp.hcomp-c-include
 ./usr/include/mm_malloc.h			comp-obsolete		obsolete
 ./usr/include/mmintrin.h			comp-obsolete		obsolete
-./usr/include/pmc.hcomp-obsolete
+./usr/include/pmc.hcomp-obsolete		obsolete
 ./usr/include/pmmintrin.h			comp-obsolete		obsolete
 ./usr/include/x86comp-c-include
 ./usr/include/x86/aout_machdep.h		comp-c-include

CVS commit: src/distrib/sets/lists/comp

2017-03-08 Thread Robert Elz

Module Name:src
Committed By:   kre
Date:   Wed Mar  8 21:56:05 UTC 2017

Modified Files:
src/distrib/sets/lists/comp: md.i386

Log Message:
/usr/include/pmc.h is installed on i386 iff src/lib/libpmc/pmc_i386.c exists
(which it no longer does - only arm has a similar .c file so only arm
builds install pmc.h in /usr/include now)

This should unbreak the i386 build.


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/distrib/sets/lists/comp/md.i386

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

Modified files:

Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.165 src/distrib/sets/lists/comp/md.i386:1.166
--- src/distrib/sets/lists/comp/md.i386:1.165	Wed Mar  8 16:52:17 2017
+++ src/distrib/sets/lists/comp/md.i386	Wed Mar  8 21:56:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.165 2017/03/08 16:52:17 maxv Exp $
+# $NetBSD: md.i386,v 1.166 2017/03/08 21:56:05 kre Exp $
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/ammintrin.h		comp-obsolete		obsolete
@@ -412,7 +412,7 @@
 ./usr/include/ieeefp.hcomp-c-include
 ./usr/include/mm_malloc.h			comp-obsolete		obsolete
 ./usr/include/mmintrin.h			comp-obsolete		obsolete
-./usr/include/pmc.hcomp-c-include
+./usr/include/pmc.hcomp-obsolete
 ./usr/include/pmmintrin.h			comp-obsolete		obsolete
 ./usr/include/x86comp-c-include
 ./usr/include/x86/aout_machdep.h		comp-c-include

CVS commit: src/sys/arch

2017-03-08 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Wed Mar  8 18:00:49 UTC 2017

Modified Files:
src/sys/arch/amd64/conf: ALL
src/sys/arch/i386/conf: ALL
src/sys/arch/xen/include: xenpmap.h
src/sys/arch/xen/x86: x86_xpmap.c

Log Message:
A few changes:
 * Use markers to reduce false sharing.
 * Remove XENDEBUG_SYNC and several debug messages, they are just useless.
 * Remove xen_vcpu_*. They are unused and not optimized: if we really
   wanted to flush ranges we should pack the VAs in a mmuext_op array
   instead of performing several hypercalls in a loop.
 * Start removing PG_k.
 * KNF, reorder, simplify and remove stupid comments.


To generate a diff of this commit:
cvs rdiff -u -r1.53 -r1.54 src/sys/arch/amd64/conf/ALL
cvs rdiff -u -r1.414 -r1.415 src/sys/arch/i386/conf/ALL
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/xen/include/xenpmap.h
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/xen/x86/x86_xpmap.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/amd64/conf/ALL
diff -u src/sys/arch/amd64/conf/ALL:1.53 src/sys/arch/amd64/conf/ALL:1.54
--- src/sys/arch/amd64/conf/ALL:1.53	Sun Feb 26 12:03:14 2017
+++ src/sys/arch/amd64/conf/ALL	Wed Mar  8 18:00:49 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.53 2017/02/26 12:03:14 rin Exp $
+# $NetBSD: ALL,v 1.54 2017/03/08 18:00:49 maxv Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/amd64/conf/std.amd64"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.53 $"
+#ident		"ALL-$Revision: 1.54 $"
 
 maxusers	64		# estimated number of users
 
@@ -2334,7 +2334,6 @@ options XDEBUG
 options XENDEBUG
 options XENDEBUG_LOW
 options XENDEBUG_NET
-options XENDEBUG_SYNC
 options XENDEBUG_VBD
 options XENNET_DEBUG
 options XENNET_DEBUG_DUMP

Index: src/sys/arch/i386/conf/ALL
diff -u src/sys/arch/i386/conf/ALL:1.414 src/sys/arch/i386/conf/ALL:1.415
--- src/sys/arch/i386/conf/ALL:1.414	Sun Feb 26 12:03:14 2017
+++ src/sys/arch/i386/conf/ALL	Wed Mar  8 18:00:49 2017
@@ -1,4 +1,4 @@
-# $NetBSD: ALL,v 1.414 2017/02/26 12:03:14 rin Exp $
+# $NetBSD: ALL,v 1.415 2017/03/08 18:00:49 maxv Exp $
 # From NetBSD: GENERIC,v 1.787 2006/10/01 18:37:54 bouyer Exp
 #
 # ALL machine description file
@@ -17,7 +17,7 @@ include 	"arch/i386/conf/std.i386"
 
 options 	INCLUDE_CONFIG_FILE	# embed config file in kernel binary
 
-#ident		"ALL-$Revision: 1.414 $"
+#ident		"ALL-$Revision: 1.415 $"
 
 maxusers	64		# estimated number of users
 
@@ -2533,7 +2533,6 @@ options XDEBUG
 options XENDEBUG
 options XENDEBUG_LOW
 options XENDEBUG_NET
-options XENDEBUG_SYNC
 options XENDEBUG_VBD
 options XENNET_DEBUG
 options XENNET_DEBUG_DUMP

Index: src/sys/arch/xen/include/xenpmap.h
diff -u src/sys/arch/xen/include/xenpmap.h:1.38 src/sys/arch/xen/include/xenpmap.h:1.39
--- src/sys/arch/xen/include/xenpmap.h:1.38	Tue May  6 04:26:24 2014
+++ src/sys/arch/xen/include/xenpmap.h	Wed Mar  8 18:00:49 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: xenpmap.h,v 1.38 2014/05/06 04:26:24 cherry Exp $	*/
+/*	$NetBSD: xenpmap.h,v 1.39 2017/03/08 18:00:49 maxv Exp $	*/
 
 /*
  *
@@ -49,8 +49,6 @@ void xpq_queue_tlb_flush(void);
 void xpq_queue_pin_table(paddr_t, int);
 void xpq_queue_unpin_table(paddr_t);
 int  xpq_update_foreign(paddr_t, pt_entry_t, int);
-void xen_vcpu_mcast_invlpg(vaddr_t, vaddr_t, kcpuset_t *);
-void xen_vcpu_bcast_invlpg(vaddr_t, vaddr_t);
 void xen_mcast_tlbflush(kcpuset_t *);
 void xen_bcast_tlbflush(void);
 void xen_mcast_invlpg(vaddr_t, kcpuset_t *);

Index: src/sys/arch/xen/x86/x86_xpmap.c
diff -u src/sys/arch/xen/x86/x86_xpmap.c:1.71 src/sys/arch/xen/x86/x86_xpmap.c:1.72
--- src/sys/arch/xen/x86/x86_xpmap.c:1.71	Thu Feb  2 08:57:04 2017
+++ src/sys/arch/xen/x86/x86_xpmap.c	Wed Mar  8 18:00:49 2017
@@ -1,4 +1,33 @@
-/*	$NetBSD: x86_xpmap.c,v 1.71 2017/02/02 08:57:04 maxv Exp $	*/
+/*	$NetBSD: x86_xpmap.c,v 1.72 2017/03/08 18:00:49 maxv Exp $	*/
+
+/*
+ * Copyright (c) 2017 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Maxime Villard.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS

CVS commit: src/sys/arch/evbarm/awin

2017-03-08 Thread Jonathan A. Kollasch

Module Name:src
Committed By:   jakllsch
Date:   Wed Mar  8 17:06:35 UTC 2017

Modified Files:
src/sys/arch/evbarm/awin: awin_sysconfig.c

Log Message:
Avoid tripping on opposite-endian sysconfig/fex blobs.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/awin/awin_sysconfig.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/evbarm/awin/awin_sysconfig.c
diff -u src/sys/arch/evbarm/awin/awin_sysconfig.c:1.2 src/sys/arch/evbarm/awin/awin_sysconfig.c:1.3
--- src/sys/arch/evbarm/awin/awin_sysconfig.c:1.2	Sun Oct 25 20:46:46 2015
+++ src/sys/arch/evbarm/awin/awin_sysconfig.c	Wed Mar  8 17:06:35 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_sysconfig.c,v 1.2 2015/10/25 20:46:46 bouyer Exp $ */
+/* $NetBSD: awin_sysconfig.c,v 1.3 2017/03/08 17:06:35 jakllsch Exp $ */
 
 /*-
  * Copyright (c) 2014 Jared D. McNeill 
@@ -29,7 +29,7 @@
 #include "opt_allwinner.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: awin_sysconfig.c,v 1.2 2015/10/25 20:46:46 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_sysconfig.c,v 1.3 2017/03/08 17:06:35 jakllsch Exp $");
 
 #include 
 #include 
@@ -90,6 +90,8 @@ static bool awin_sysconfig_parse(const c
 bool
 awin_sysconfig_init(void)
 {
+	struct awin_sysconfig_head head;
+
 	if (get_bootconf_option(boot_args, "sysconfig",
 	BOOTOPT_TYPE_HEXINT, _sysconfig_base) == 0) {
 		return false;
@@ -102,6 +104,13 @@ awin_sysconfig_init(void)
 	(awin_sysconfig_base + KERNEL_BASE_VOFFSET);
 	memcpy(awin_sysconfig, sysconfig, AWIN_SYSCONFIG_SIZE);
 
+	memcpy(, _sysconfig[0], sizeof(head));
+	if (head.count >= 0x0100) {
+		printf("%s(): 0x%x entries in sysconfig, ignoring.\n",
+		__func__, head.count);
+		return false;
+	}
+
 	return true;
 }

CVS commit: src/distrib/sets/lists

2017-03-08 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Wed Mar  8 16:52:17 UTC 2017

Modified Files:
src/distrib/sets/lists/base: md.i386
src/distrib/sets/lists/comp: md.i386
src/distrib/sets/lists/debug: md.i386

Log Message:
Mark as obsolete instead of removing (from Thomas Klausner).


To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/distrib/sets/lists/base/md.i386
cvs rdiff -u -r1.164 -r1.165 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/debug/md.i386

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

Modified files:

Index: src/distrib/sets/lists/base/md.i386
diff -u src/distrib/sets/lists/base/md.i386:1.144 src/distrib/sets/lists/base/md.i386:1.145
--- src/distrib/sets/lists/base/md.i386:1.144	Wed Mar  8 15:53:00 2017
+++ src/distrib/sets/lists/base/md.i386	Wed Mar  8 16:52:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.144 2017/03/08 15:53:00 maxv Exp $
+# $NetBSD: md.i386,v 1.145 2017/03/08 16:52:17 maxv Exp $
 ./dev/lms0	base-obsolete		obsolete
 ./dev/mms0	base-obsolete		obsolete
 ./dev/pms0	base-obsolete		obsolete
@@ -25,6 +25,9 @@
 ./usr/lib/libm387.sobase-sys-shlib		pic
 ./usr/lib/libm387.so.0base-sys-shlib		pic
 ./usr/lib/libm387.so.0.1			base-sys-shlib		pic
+./usr/lib/libpmc.sobase-obsolete		obsolete
+./usr/lib/libpmc.so.1base-obsolete		obsolete
+./usr/lib/libpmc.so.1.0base-obsolete		obsolete
 ./usr/libexec/ld.sobase-sys-shlib
 ./usr/lkm/aps.o	base-obsolete		obsolete
 ./usr/lkm/compat_freebsd.o			base-obsolete		obsolete

Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.164 src/distrib/sets/lists/comp/md.i386:1.165
--- src/distrib/sets/lists/comp/md.i386:1.164	Wed Mar  8 15:53:01 2017
+++ src/distrib/sets/lists/comp/md.i386	Wed Mar  8 16:52:17 2017
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.164 2017/03/08 15:53:01 maxv Exp $
+# $NetBSD: md.i386,v 1.165 2017/03/08 16:52:17 maxv Exp $
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/ammintrin.h		comp-obsolete		obsolete
@@ -457,4 +457,8 @@
 ./usr/lib/libm387.acomp-c-lib
 ./usr/lib/libm387_p.acomp-c-proflib		profile
 ./usr/lib/libm387_pic.acomp-c-piclib		pic,picinstall
+./usr/lib/libpmc.acomp-obsolete		obsolete
+./usr/lib/libpmc_p.acomp-obsolete		obsolete
+./usr/lib/libpmc_pic.acomp-obsolete		obsolete
 ./usr/libdata/lint/llib-li386.ln		comp-c-lintlib		lint
+./usr/libdata/lint/llib-lpmc.ln			comp-obsolete		obsolete

Index: src/distrib/sets/lists/debug/md.i386
diff -u src/distrib/sets/lists/debug/md.i386:1.11 src/distrib/sets/lists/debug/md.i386:1.12
--- src/distrib/sets/lists/debug/md.i386:1.11	Wed Mar  8 15:53:01 2017
+++ src/distrib/sets/lists/debug/md.i386	Wed Mar  8 16:52:17 2017
@@ -1,6 +1,7 @@
-# $NetBSD: md.i386,v 1.11 2017/03/08 15:53:01 maxv Exp $
+# $NetBSD: md.i386,v 1.12 2017/03/08 16:52:17 maxv Exp $
 ./usr/lib/libi386_g.acomp-c-debuglib		debuglib
 ./usr/lib/libm387_g.acomp-c-debuglib		debuglib
+./usr/lib/libpmc_g.acomp-obsolete		obsolete
 ./usr/libdata/debug/lib/libm387.so.0.1.debug	comp-sys-debug	pic,debug
 ./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
@@ -8,6 +9,7 @@
 ./usr/libdata/debug/usr/bin/pmc.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/lib/libi386.so.1.0.debug	comp-sys-debug	pic,debug
 ./usr/libdata/debug/usr/lib/libm387.so.0.1.debug	comp-sys-debug	pic,debug
+./usr/libdata/debug/usr/lib/libpmc.so.1.0.debug		comp-obsolete	obsolete
 ./usr/libdata/debug/usr/sbin/acpidump.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/amldb.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/apm.debug		comp-sysutil-debug	debug

CVS commit: src

2017-03-08 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Wed Mar  8 16:42:27 UTC 2017

Modified Files:
src/sys/arch/i386/i386: pmc.c
src/sys/arch/x86/include: sysarch.h
src/usr.bin/pmc: pmc.c

Log Message:
Add a version argument, set to 1, and check it in usr.bin/pmc. Use uint32_t
instead uint8_t since we now need 12bit selectors (10h family). And while
here KNF.


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/i386/pmc.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/x86/include/sysarch.h
cvs rdiff -u -r1.18 -r1.19 src/usr.bin/pmc/pmc.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/i386/i386/pmc.c
diff -u src/sys/arch/i386/i386/pmc.c:1.23 src/sys/arch/i386/i386/pmc.c:1.24
--- src/sys/arch/i386/i386/pmc.c:1.23	Sat Feb 18 15:56:03 2017
+++ src/sys/arch/i386/i386/pmc.c	Wed Mar  8 16:42:27 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmc.c,v 1.23 2017/02/18 15:56:03 maxv Exp $	*/
+/*	$NetBSD: pmc.c,v 1.24 2017/03/08 16:42:27 maxv Exp $	*/
 
 /*
  * Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.23 2017/02/18 15:56:03 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmc.c,v 1.24 2017/03/08 16:42:27 maxv Exp $");
 
 #include 
 #include 
@@ -275,6 +275,7 @@ sys_pmc_info(struct lwp *l, struct x86_p
 
 	memset(, 0, sizeof(rv));
 
+	rv.vers = PMC_VERSION;
 	rv.type = pmc_type;
 	rv.flags = pmc_flags;
 
@@ -297,7 +298,7 @@ sys_pmc_startstop(struct lwp *l, struct 
 	if (error)
 		return error;
 
-	if (args.counter < 0 || args.counter >= pmc_ncounters)
+	if (args.counter >= pmc_ncounters)
 		return EINVAL;
 
 	start = (args.flags & (PMC_SETUP_KERNEL|PMC_SETUP_USER)) != 0;
@@ -338,7 +339,7 @@ sys_pmc_read(struct lwp *l, struct x86_p
 	if (error)
 		return error;
 
-	if (args.counter < 0 || args.counter >= pmc_ncounters)
+	if (args.counter >= pmc_ncounters)
 		return EINVAL;
 	pmc = _state[args.counter];
 

Index: src/sys/arch/x86/include/sysarch.h
diff -u src/sys/arch/x86/include/sysarch.h:1.9 src/sys/arch/x86/include/sysarch.h:1.10
--- src/sys/arch/x86/include/sysarch.h:1.9	Wed Jul  7 01:14:53 2010
+++ src/sys/arch/x86/include/sysarch.h	Wed Mar  8 16:42:27 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: sysarch.h,v 1.9 2010/07/07 01:14:53 chs Exp $	*/
+/*	$NetBSD: sysarch.h,v 1.10 2017/03/08 16:42:27 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -34,62 +34,62 @@
 
 #define X86_GET_LDT		0
 #define X86_SET_LDT		1
-#define	X86_IOPL		2
-#define	X86_GET_IOPERM		3
-#define	X86_SET_IOPERM		4
-#define	X86_OLD_VM86		5
-#define	X86_PMC_INFO		8
-#define	X86_PMC_STARTSTOP	9
-#define	X86_PMC_READ		10
+#define X86_IOPL		2
+#define X86_GET_IOPERM		3
+#define X86_SET_IOPERM		4
+#define X86_OLD_VM86		5
+#define X86_PMC_INFO		8
+#define X86_PMC_STARTSTOP	9
+#define X86_PMC_READ		10
 #define X86_GET_MTRR		11
 #define X86_SET_MTRR		12
-#define	X86_VM86		13
-#define	X86_GET_GSBASE		14
-#define	X86_GET_FSBASE		15
-#define	X86_SET_GSBASE		16
-#define	X86_SET_FSBASE		17
+#define X86_VM86		13
+#define X86_GET_GSBASE		14
+#define X86_GET_FSBASE		15
+#define X86_SET_GSBASE		16
+#define X86_SET_FSBASE		17
 
 #ifdef _KERNEL
-#define	_X86_SYSARCH_L(x)	x86_##x
-#define	_X86_SYSARCH_U(x)	X86_##x
+#define _X86_SYSARCH_L(x)	x86_##x
+#define _X86_SYSARCH_U(x)	X86_##x
 #elif defined(__i386__)
-#define	_X86_SYSARCH_L(x)	i386_##x
-#define	_X86_SYSARCH_U(x)	I386_##x
+#define _X86_SYSARCH_L(x)	i386_##x
+#define _X86_SYSARCH_U(x)	I386_##x
 #define I386_GET_LDT		X86_GET_LDT
 #define I386_SET_LDT		X86_SET_LDT
-#define	I386_IOPL		X86_IOPL
-#define	I386_GET_IOPERM		X86_GET_IOPERM
-#define	I386_SET_IOPERM		X86_SET_IOPERM
-#define	I386_OLD_VM86		X86_OLD_VM86
-#define	I386_PMC_INFO		X86_PMC_INFO
-#define	I386_PMC_STARTSTOP	X86_PMC_STARTSTOP
-#define	I386_PMC_READ		X86_PMC_READ
+#define I386_IOPL		X86_IOPL
+#define I386_GET_IOPERM		X86_GET_IOPERM
+#define I386_SET_IOPERM		X86_SET_IOPERM
+#define I386_OLD_VM86		X86_OLD_VM86
+#define I386_PMC_INFO		X86_PMC_INFO
+#define I386_PMC_STARTSTOP	X86_PMC_STARTSTOP
+#define I386_PMC_READ		X86_PMC_READ
 #define I386_GET_MTRR		X86_GET_MTRR
 #define I386_SET_MTRR		X86_SET_MTRR
-#define	I386_VM86		X86_VM86
-#define	I386_GET_GSBASE		X86_GET_GSBASE
-#define	I386_GET_FSBASE		X86_GET_FSBASE
-#define	I386_SET_GSBASE		X86_SET_GSBASE
-#define	I386_SET_FSBASE		X86_SET_FSBASE
+#define I386_VM86		X86_VM86
+#define I386_GET_GSBASE		X86_GET_GSBASE
+#define I386_GET_FSBASE		X86_GET_FSBASE
+#define I386_SET_GSBASE		X86_SET_GSBASE
+#define I386_SET_FSBASE		X86_SET_FSBASE
 #else
-#define	_X86_SYSARCH_L(x)	x86_64_##x
-#define	_X86_SYSARCH_U(x)	X86_64_##x
+#define _X86_SYSARCH_L(x)	x86_64_##x
+#define _X86_SYSARCH_U(x)	X86_64_##x
 #define X86_64_GET_LDT		X86_GET_LDT
 #define X86_64_SET_LDT		X86_SET_LDT
-#define	X86_64_IOPL		X86_IOPL
-#define	X86_64_GET_IOPERM	X86_GET_IOPERM
-#define	X86_64_SET_IOPERM	X86_SET_IOPERM
-#define

CVS commit: src/lib/libarch/i386

2017-03-08 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Wed Mar  8 16:09:27 UTC 2017

Modified Files:
src/lib/libarch/i386: i386_pmc.c

Log Message:
Deprecate the pmc functions in libi386. The parameters will be updated,
and we are not interested in maintaining this anyway. Now i386's pmc
interface is opaque, which is good.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/lib/libarch/i386/i386_pmc.c

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

Modified files:

Index: src/lib/libarch/i386/i386_pmc.c
diff -u src/lib/libarch/i386/i386_pmc.c:1.3 src/lib/libarch/i386/i386_pmc.c:1.4
--- src/lib/libarch/i386/i386_pmc.c:1.3	Wed Sep 13 05:22:12 2000
+++ src/lib/libarch/i386/i386_pmc.c	Wed Mar  8 16:09:27 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: i386_pmc.c,v 1.3 2000/09/13 05:22:12 thorpej Exp $	*/
+/*	$NetBSD: i386_pmc.c,v 1.4 2017/03/08 16:09:27 maxv Exp $	*/
 
 /*-
  * Copyright (c) 2000 Zembu Labs, Inc.
@@ -44,29 +44,17 @@
 int
 i386_pmc_info(struct i386_pmc_info_args *args)
 {
-
-	if (sysarch(I386_PMC_INFO, args) == -1)
-		return (-1);
-
-	return (0);
+	return -1;
 }
 
 int
 i386_pmc_startstop(struct i386_pmc_startstop_args *args)
 {
-
-	if (sysarch(I386_PMC_STARTSTOP, args) == -1)
-		return (-1);
-
-	return (0);
+	return -1;
 }
 
 int
 i386_pmc_read(struct i386_pmc_read_args *args)
 {
-
-	if (sysarch(I386_PMC_READ, args) == -1)
-		return (-1);
-
-	return (0);
+	return -1;
 }

CVS commit: src/usr.bin/pmc

2017-03-08 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Wed Mar  8 16:05:29 UTC 2017

Modified Files:
src/usr.bin/pmc: Makefile

Log Message:
We don't use libi386 anymore.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.bin/pmc/Makefile

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

Modified files:

Index: src/usr.bin/pmc/Makefile
diff -u src/usr.bin/pmc/Makefile:1.3 src/usr.bin/pmc/Makefile:1.4
--- src/usr.bin/pmc/Makefile:1.3	Tue Apr 14 22:15:25 2009
+++ src/usr.bin/pmc/Makefile	Wed Mar  8 16:05:29 2017
@@ -1,10 +1,7 @@
-#	$NetBSD: Makefile,v 1.3 2009/04/14 22:15:25 lukem Exp $
+#	$NetBSD: Makefile,v 1.4 2017/03/08 16:05:29 maxv Exp $
 
 .if (${MACHINE_ARCH} == "i386")
 PROG=	pmc
-
-LDADD+=	-li386
-DPADD+=	${LIBI386}
 .else
 MAN=	pmc.1
 .endif

CVS commit: src

2017-03-08 Thread Maxime Villard

Module Name:src
Committed By:   maxv
Date:   Wed Mar  8 15:53:01 UTC 2017

Modified Files:
src/distrib/sets/lists/base: md.i386
src/distrib/sets/lists/comp: md.i386
src/distrib/sets/lists/debug: md.i386
Removed Files:
src/lib/libpmc: pmc_i386.c

Log Message:
Remove i386 from libpmc; it has its own interface (sysarch), and we won't
maintain compatibility.

Verily, I cannot build a distribution now, so I'm committing this rather
blindly. This being said, it looks correct enough.


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/distrib/sets/lists/base/md.i386
cvs rdiff -u -r1.163 -r1.164 src/distrib/sets/lists/comp/md.i386
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/debug/md.i386
cvs rdiff -u -r1.4 -r0 src/lib/libpmc/pmc_i386.c

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

Modified files:

Index: src/distrib/sets/lists/base/md.i386
diff -u src/distrib/sets/lists/base/md.i386:1.143 src/distrib/sets/lists/base/md.i386:1.144
--- src/distrib/sets/lists/base/md.i386:1.143	Wed Aug  6 12:15:01 2014
+++ src/distrib/sets/lists/base/md.i386	Wed Mar  8 15:53:00 2017
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.143 2014/08/06 12:15:01 martin Exp $
+# $NetBSD: md.i386,v 1.144 2017/03/08 15:53:00 maxv Exp $
 ./dev/lms0	base-obsolete		obsolete
 ./dev/mms0	base-obsolete		obsolete
 ./dev/pms0	base-obsolete		obsolete
@@ -25,9 +25,6 @@
 ./usr/lib/libm387.sobase-sys-shlib		pic
 ./usr/lib/libm387.so.0base-sys-shlib		pic
 ./usr/lib/libm387.so.0.1			base-sys-shlib		pic
-./usr/lib/libpmc.sobase-sys-shlib		pic
-./usr/lib/libpmc.so.1base-sys-shlib		pic
-./usr/lib/libpmc.so.1.0base-sys-shlib		pic
 ./usr/libexec/ld.sobase-sys-shlib
 ./usr/lkm/aps.o	base-obsolete		obsolete
 ./usr/lkm/compat_freebsd.o			base-obsolete		obsolete

Index: src/distrib/sets/lists/comp/md.i386
diff -u src/distrib/sets/lists/comp/md.i386:1.163 src/distrib/sets/lists/comp/md.i386:1.164
--- src/distrib/sets/lists/comp/md.i386:1.163	Thu Feb 23 03:34:22 2017
+++ src/distrib/sets/lists/comp/md.i386	Wed Mar  8 15:53:01 2017
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.163 2017/02/23 03:34:22 kamil Exp $
+# $NetBSD: md.i386,v 1.164 2017/03/08 15:53:01 maxv Exp $
 ./usr/include/clang-3.4/__wmmintrin_aes.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/__wmmintrin_pclmul.h	comp-obsolete		obsolete
 ./usr/include/clang-3.4/ammintrin.h		comp-obsolete		obsolete
@@ -457,8 +457,4 @@
 ./usr/lib/libm387.acomp-c-lib
 ./usr/lib/libm387_p.acomp-c-proflib		profile
 ./usr/lib/libm387_pic.acomp-c-piclib		pic,picinstall
-./usr/lib/libpmc.acomp-c-lib
-./usr/lib/libpmc_p.acomp-c-proflib		profile
-./usr/lib/libpmc_pic.acomp-c-piclib		pic,picinstall
 ./usr/libdata/lint/llib-li386.ln		comp-c-lintlib		lint
-./usr/libdata/lint/llib-lpmc.ln			comp-c-lintlib		lint

Index: src/distrib/sets/lists/debug/md.i386
diff -u src/distrib/sets/lists/debug/md.i386:1.10 src/distrib/sets/lists/debug/md.i386:1.11
--- src/distrib/sets/lists/debug/md.i386:1.10	Wed Feb 22 01:07:13 2017
+++ src/distrib/sets/lists/debug/md.i386	Wed Mar  8 15:53:01 2017
@@ -1,7 +1,6 @@
-# $NetBSD: md.i386,v 1.10 2017/02/22 01:07:13 kamil Exp $
+# $NetBSD: md.i386,v 1.11 2017/03/08 15:53:01 maxv Exp $
 ./usr/lib/libi386_g.acomp-c-debuglib		debuglib
 ./usr/lib/libm387_g.acomp-c-debuglib		debuglib
-./usr/lib/libpmc_g.acomp-c-debuglib		debuglib
 ./usr/libdata/debug/lib/libm387.so.0.1.debug	comp-sys-debug	pic,debug
 ./usr/libdata/debug/sbin/ldconfig.debug		comp-sysutil-debug	debug,pic
 ./usr/libdata/debug/usr/bin/fdformat.debug	comp-util-debug		debug
@@ -9,7 +8,6 @@
 ./usr/libdata/debug/usr/bin/pmc.debug		comp-util-debug		debug
 ./usr/libdata/debug/usr/lib/libi386.so.1.0.debug	comp-sys-debug	pic,debug
 ./usr/libdata/debug/usr/lib/libm387.so.0.1.debug	comp-sys-debug	pic,debug
-./usr/libdata/debug/usr/lib/libpmc.so.1.0.debug		comp-sys-debug	pic,debug
 ./usr/libdata/debug/usr/sbin/acpidump.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/amldb.debug	comp-sysutil-debug	debug
 ./usr/libdata/debug/usr/sbin/apm.debug		comp-sysutil-debug	debug

CVS commit: [netbsd-6-0] src/doc

2017-03-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Mar  8 14:57:27 UTC 2017

Modified Files:
src/doc [netbsd-6-0]: CHANGES-6.0.7

Log Message:
Ticket #1443


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.87 -r1.1.2.88 src/doc/CHANGES-6.0.7

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

Modified files:

Index: src/doc/CHANGES-6.0.7
diff -u src/doc/CHANGES-6.0.7:1.1.2.87 src/doc/CHANGES-6.0.7:1.1.2.88
--- src/doc/CHANGES-6.0.7:1.1.2.87	Wed Mar  8 00:39:57 2017
+++ src/doc/CHANGES-6.0.7	Wed Mar  8 14:57:26 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.0.7,v 1.1.2.87 2017/03/08 00:39:57 snj Exp $
+# $NetBSD: CHANGES-6.0.7,v 1.1.2.88 2017/03/08 14:57:26 martin Exp $
 
 A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7
 release:
@@ -10339,3 +10339,39 @@ x11/lib/ICE/Makefilepatch
 	(80f62c54fbd50a3bbdf9c37258525098c9117830 upstream)
 	[mrg, ticket #1442]
 
+xsrc/external/mit/xorg-server.old/dist/configure.ac	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/os.h	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/auth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/auth.c	1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/mitauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/mitauth.c	1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/osdep.h	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/rpcauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/timingsafe_memcmp.c 1.1 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/xdmauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/include/dix-config.h 1.3 (patch)
+xsrc/external/mit/xorg-server.old/include/dix-config.h 1.4 (patch)
+xsrc/external/mit/xorg-server/dist/configure.ac	1.4 (patch)
+xsrc/external/mit/xorg-server/dist/configure.ac	1.5 (patch)
+xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.2 (patch)
+xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.3 (patch)
+xsrc/external/mit/xorg-server/dist/include/os.h	1.8 (patch)
+xsrc/external/mit/xorg-server/dist/os/auth.c		1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/auth.c		1.3 (patch)
+xsrc/external/mit/xorg-server/dist/os/mitauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/mitauth.c	1.3 (patch)
+xsrc/external/mit/xorg-server/dist/os/osdep.h	1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/rpcauth.c	1.4 (patch)
+xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c 1.1 (patch)
+xsrc/external/mit/xorg-server/dist/os/xdmauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server/include/dix-config.h	1.26 (patch)
+xsrc/external/mit/xorg-server/include/dix-config.h	1.27 (patch)
+external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 (patch)
+external/mit/xorg/server/xorg-server/os/Makefile 1.15 (patch)
+
+	Apply upstream fixes for generation and comparision of
+	MIT-MAGIC-COOKIES, fixing CVE-2017-2624
+	[mrg, ticket #1443]
+

CVS commit: [netbsd-6-0] src

2017-03-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Mar  8 14:56:51 UTC 2017

Modified Files:
src/external/mit/xorg/server/xorg-server/os [netbsd-6-0]: Makefile
src/x11/Xserver/os [netbsd-6-0]: Makefile

Log Message:
external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 (patch)
external/mit/xorg/server/xorg-server/os/Makefile 1.15 (patch)

Apply upstream fixes for generation and comparision of
MIT-MAGIC-COOKIES, fixing CVE-2017-2624
[mrg, ticket #1443]


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.10.1 \
src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.18 -r1.18.12.1 src/x11/Xserver/os/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.9 src/external/mit/xorg/server/xorg-server/os/Makefile:1.9.10.1
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.9	Tue Aug  2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/os/Makefile	Wed Mar  8 14:56:51 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2011/08/02 09:11:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.9.10.1 2017/03/08 14:56:51 martin Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -9,7 +9,8 @@ LIB=	os
 SRCS=	WaitFor.c access.c auth.c connection.c io.c mitauth.c \
 	oscolor.c osinit.c utils.c xdmauth.c \
 	xstrans.c xprintf.c log.c xdmcp.c \
-	rpcauth.c backtrace.c xprintf.c xsha1.c
+	rpcauth.c backtrace.c xprintf.c xsha1.c \
+	timingsafe_memcmp.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \

Index: src/x11/Xserver/os/Makefile
diff -u src/x11/Xserver/os/Makefile:1.18 src/x11/Xserver/os/Makefile:1.18.12.1
--- src/x11/Xserver/os/Makefile:1.18	Mon May 30 02:12:02 2011
+++ src/x11/Xserver/os/Makefile	Wed Mar  8 14:56:51 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2011/05/30 02:12:02 christos Exp $
+#	$NetBSD: Makefile,v 1.18.12.1 2017/03/08 14:56:51 martin Exp $
 
 .include "../Makefile.serverlib"
 .include 
@@ -7,7 +7,8 @@ LIB=	os
 .PATH:	${X11SRCDIR.xc}/lib/xtrans
 SRCS=	WaitFor.c access.c connection.c io.c oscolor.c osinit.c \
 	utils.c log.c auth.c mitauth.c secauth.c xdmauth.c xdmcp.c \
-	xdmcp.c transport.c lbxio.c GetTimeInMillis.c
+	xdmcp.c transport.c lbxio.c GetTimeInMillis.c \
+	timingsafe_memcmp.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/include \
 		-I${XSERVERINCDIR} \

CVS commit: [netbsd-6-0] xsrc

2017-03-08 Thread Martin Husemann

Module Name:xsrc
Committed By:   martin
Date:   Wed Mar  8 14:56:16 UTC 2017

Modified Files:
xsrc/external/mit/xorg-server/dist [netbsd-6-0]: configure.ac
xsrc/external/mit/xorg-server/dist/include [netbsd-6-0]:
dix-config.h.in os.h
xsrc/external/mit/xorg-server/dist/os [netbsd-6-0]: auth.c mitauth.c
osdep.h rpcauth.c xdmauth.c
xsrc/external/mit/xorg-server/include [netbsd-6-0]: dix-config.h
xsrc/xfree/xc/programs/Xserver/include [netbsd-6-0]: os.h
xsrc/xfree/xc/programs/Xserver/os [netbsd-6-0]: auth.c mitauth.c
osdep.h rpcauth.c xdmauth.c
Added Files:
xsrc/external/mit/xorg-server/dist/os [netbsd-6-0]: timingsafe_memcmp.c
xsrc/xfree/xc/programs/Xserver/os [netbsd-6-0]: timingsafe_memcmp.c

Log Message:
xsrc/external/mit/xorg-server.old/dist/configure.ac 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/include/os.h 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/auth.c1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/auth.c1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/os/mitauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/mitauth.c 1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/os/osdep.h   1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/rpcauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/timingsafe_memcmp.c 1.1 (patch)
xsrc/external/mit/xorg-server.old/dist/os/xdmauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/include/dix-config.h 1.3 (patch)
xsrc/external/mit/xorg-server.old/include/dix-config.h 1.4 (patch)
xsrc/external/mit/xorg-server/dist/configure.ac 1.4 (patch)
xsrc/external/mit/xorg-server/dist/configure.ac 1.5 (patch)
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.2 (patch)
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.3 (patch)
xsrc/external/mit/xorg-server/dist/include/os.h 1.8 (patch)
xsrc/external/mit/xorg-server/dist/os/auth.c1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/auth.c1.3 (patch)
xsrc/external/mit/xorg-server/dist/os/mitauth.c 1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/mitauth.c 1.3 (patch)
xsrc/external/mit/xorg-server/dist/os/osdep.h   1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/rpcauth.c 1.4 (patch)
xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c 1.1 (patch)
xsrc/external/mit/xorg-server/dist/os/xdmauth.c 1.2 (patch)
xsrc/external/mit/xorg-server/include/dix-config.h  1.26 (patch)
xsrc/external/mit/xorg-server/include/dix-config.h  1.27 (patch)

Apply upstream fixes for generation and comparision of
MIT-MAGIC-COOKIES, fixing CVE-2017-2624
[mrg, ticket #1443]


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8.4.1 -r1.1.1.8.4.2 \
xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.4.1 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
cvs rdiff -u -r1.6 -r1.6.4.1 xsrc/external/mit/xorg-server/dist/include/os.h
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.4.1 \
xsrc/external/mit/xorg-server/dist/os/auth.c \
xsrc/external/mit/xorg-server/dist/os/xdmauth.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.4.1 \
xsrc/external/mit/xorg-server/dist/os/mitauth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.4.1 \
xsrc/external/mit/xorg-server/dist/os/osdep.h
cvs rdiff -u -r1.1.1.3.4.1 -r1.1.1.3.4.2 \
xsrc/external/mit/xorg-server/dist/os/rpcauth.c
cvs rdiff -u -r0 -r1.1.10.2 \
xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c
cvs rdiff -u -r1.19 -r1.19.4.1 \
xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.5 -r1.5.16.1 xsrc/xfree/xc/programs/Xserver/include/os.h
cvs rdiff -u -r1.4 -r1.4.28.1 xsrc/xfree/xc/programs/Xserver/os/auth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.30.1 \
xsrc/xfree/xc/programs/Xserver/os/mitauth.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.16.1 \
xsrc/xfree/xc/programs/Xserver/os/osdep.h
cvs rdiff -u -r1.1.1.5.28.1 -r1.1.1.5.28.2 \
xsrc/xfree/xc/programs/Xserver/os/rpcauth.c
cvs rdiff -u -r0 -r1.1.10.2 \
xsrc/xfree/xc/programs/Xserver/os/timingsafe_memcmp.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.16.1 \
xsrc/xfree/xc/programs/Xserver/os/xdmauth.c

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/configure.ac
diff -u xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.8.4.1 xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.8.4.2
--- xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.8.4.1	Tue Dec  9 19:44:40 2014
+++ xsrc/external/mit/xorg-server/dist/configure.ac	Wed Mar  8 14:56:15 2017
@@ -220,6 +220,8 @@ AC_CHECK_FUNC([strlcpy], AC_DEFINE(HAS_S
 
 AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF =

CVS commit: [netbsd-6] src/doc

2017-03-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Mar  8 14:55:09 UTC 2017

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
Wrong ticket number, fix #1443 entry


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.277 -r1.1.2.278 src/doc/CHANGES-6.2

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

Modified files:

Index: src/doc/CHANGES-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.277 src/doc/CHANGES-6.2:1.1.2.278
--- src/doc/CHANGES-6.2:1.1.2.277	Wed Mar  8 14:48:52 2017
+++ src/doc/CHANGES-6.2	Wed Mar  8 14:55:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.277 2017/03/08 14:48:52 martin Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.278 2017/03/08 14:55:09 martin Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -16452,5 +16452,6 @@ external/mit/xorg/server/xorg-server/os/
 
 	Apply upstream fixes for generation and comparision of
 	MIT-MAGIC-COOKIES, fixing CVE-2017-2624
-	[mrg, ticket #1381]
+	[mrg, ticket #1443]
+

CVS commit: [netbsd-6-1] src/doc

2017-03-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Mar  8 14:52:07 UTC 2017

Modified Files:
src/doc [netbsd-6-1]: CHANGES-6.1.6

Log Message:
Ticket #1443


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.85 -r1.1.2.86 src/doc/CHANGES-6.1.6

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

Modified files:

Index: src/doc/CHANGES-6.1.6
diff -u src/doc/CHANGES-6.1.6:1.1.2.85 src/doc/CHANGES-6.1.6:1.1.2.86
--- src/doc/CHANGES-6.1.6:1.1.2.85	Wed Mar  8 00:39:23 2017
+++ src/doc/CHANGES-6.1.6	Wed Mar  8 14:52:07 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1.6,v 1.1.2.85 2017/03/08 00:39:23 snj Exp $
+# $NetBSD: CHANGES-6.1.6,v 1.1.2.86 2017/03/08 14:52:07 martin Exp $
 
 A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6
 release:
@@ -10059,3 +10059,39 @@ x11/lib/ICE/Makefilepatch
 	(80f62c54fbd50a3bbdf9c37258525098c9117830 upstream)
 	[mrg, ticket #1442]
 
+xsrc/external/mit/xorg-server.old/dist/configure.ac	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/os.h	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/auth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/auth.c	1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/mitauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/mitauth.c	1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/osdep.h	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/rpcauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/timingsafe_memcmp.c 1.1 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/xdmauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/include/dix-config.h 1.3 (patch)
+xsrc/external/mit/xorg-server.old/include/dix-config.h 1.4 (patch)
+xsrc/external/mit/xorg-server/dist/configure.ac	1.4 (patch)
+xsrc/external/mit/xorg-server/dist/configure.ac	1.5 (patch)
+xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.2 (patch)
+xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.3 (patch)
+xsrc/external/mit/xorg-server/dist/include/os.h	1.8 (patch)
+xsrc/external/mit/xorg-server/dist/os/auth.c		1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/auth.c		1.3 (patch)
+xsrc/external/mit/xorg-server/dist/os/mitauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/mitauth.c	1.3 (patch)
+xsrc/external/mit/xorg-server/dist/os/osdep.h	1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/rpcauth.c	1.4 (patch)
+xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c 1.1 (patch)
+xsrc/external/mit/xorg-server/dist/os/xdmauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server/include/dix-config.h	1.26 (patch)
+xsrc/external/mit/xorg-server/include/dix-config.h	1.27 (patch)
+external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 (patch)
+external/mit/xorg/server/xorg-server/os/Makefile 1.15 (patch)
+
+	Apply upstream fixes for generation and comparision of
+	MIT-MAGIC-COOKIES, fixing CVE-2017-2624
+	[mrg, ticket #1443]
+

CVS commit: [netbsd-6-1] src

2017-03-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Mar  8 14:50:37 UTC 2017

Modified Files:
src/external/mit/xorg/server/xorg-server/os [netbsd-6-1]: Makefile
src/x11/Xserver/os [netbsd-6-1]: Makefile

Log Message:
external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 (patch)
external/mit/xorg/server/xorg-server/os/Makefile 1.15 (patch)

Apply upstream fixes for generation and comparision of
MIT-MAGIC-COOKIES, fixing CVE-2017-2624
[mrg, ticket #1381]


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.16.1 \
src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.18 -r1.18.18.1 src/x11/Xserver/os/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.9 src/external/mit/xorg/server/xorg-server/os/Makefile:1.9.16.1
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.9	Tue Aug  2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/os/Makefile	Wed Mar  8 14:50:37 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2011/08/02 09:11:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.9.16.1 2017/03/08 14:50:37 martin Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -9,7 +9,8 @@ LIB=	os
 SRCS=	WaitFor.c access.c auth.c connection.c io.c mitauth.c \
 	oscolor.c osinit.c utils.c xdmauth.c \
 	xstrans.c xprintf.c log.c xdmcp.c \
-	rpcauth.c backtrace.c xprintf.c xsha1.c
+	rpcauth.c backtrace.c xprintf.c xsha1.c \
+	timingsafe_memcmp.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \

Index: src/x11/Xserver/os/Makefile
diff -u src/x11/Xserver/os/Makefile:1.18 src/x11/Xserver/os/Makefile:1.18.18.1
--- src/x11/Xserver/os/Makefile:1.18	Mon May 30 02:12:02 2011
+++ src/x11/Xserver/os/Makefile	Wed Mar  8 14:50:37 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2011/05/30 02:12:02 christos Exp $
+#	$NetBSD: Makefile,v 1.18.18.1 2017/03/08 14:50:37 martin Exp $
 
 .include "../Makefile.serverlib"
 .include 
@@ -7,7 +7,8 @@ LIB=	os
 .PATH:	${X11SRCDIR.xc}/lib/xtrans
 SRCS=	WaitFor.c access.c connection.c io.c oscolor.c osinit.c \
 	utils.c log.c auth.c mitauth.c secauth.c xdmauth.c xdmcp.c \
-	xdmcp.c transport.c lbxio.c GetTimeInMillis.c
+	xdmcp.c transport.c lbxio.c GetTimeInMillis.c \
+	timingsafe_memcmp.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/include \
 		-I${XSERVERINCDIR} \

CVS commit: [netbsd-6-1] xsrc

2017-03-08 Thread Martin Husemann

Module Name:xsrc
Committed By:   martin
Date:   Wed Mar  8 14:49:59 UTC 2017

Modified Files:
xsrc/external/mit/xorg-server/dist [netbsd-6-1]: configure.ac
xsrc/external/mit/xorg-server/dist/include [netbsd-6-1]:
dix-config.h.in os.h
xsrc/external/mit/xorg-server/dist/os [netbsd-6-1]: auth.c mitauth.c
osdep.h rpcauth.c xdmauth.c
xsrc/external/mit/xorg-server/include [netbsd-6-1]: dix-config.h
xsrc/xfree/xc/programs/Xserver/include [netbsd-6-1]: os.h
xsrc/xfree/xc/programs/Xserver/os [netbsd-6-1]: auth.c mitauth.c
osdep.h rpcauth.c xdmauth.c
Added Files:
xsrc/external/mit/xorg-server/dist/os [netbsd-6-1]: timingsafe_memcmp.c
xsrc/xfree/xc/programs/Xserver/os [netbsd-6-1]: timingsafe_memcmp.c

Log Message:
xsrc/external/mit/xorg-server.old/dist/configure.ac 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/include/os.h 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/auth.c1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/auth.c1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/os/mitauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/mitauth.c 1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/os/osdep.h   1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/rpcauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/timingsafe_memcmp.c 1.1 (patch)
xsrc/external/mit/xorg-server.old/dist/os/xdmauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/include/dix-config.h 1.3 (patch)
xsrc/external/mit/xorg-server.old/include/dix-config.h 1.4 (patch)
xsrc/external/mit/xorg-server/dist/configure.ac 1.4 (patch)
xsrc/external/mit/xorg-server/dist/configure.ac 1.5 (patch)
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.2 (patch)
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.3 (patch)
xsrc/external/mit/xorg-server/dist/include/os.h 1.8 (patch)
xsrc/external/mit/xorg-server/dist/os/auth.c1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/auth.c1.3 (patch)
xsrc/external/mit/xorg-server/dist/os/mitauth.c 1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/mitauth.c 1.3 (patch)
xsrc/external/mit/xorg-server/dist/os/osdep.h   1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/rpcauth.c 1.4 (patch)
xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c 1.1 (patch)
xsrc/external/mit/xorg-server/dist/os/xdmauth.c 1.2 (patch)
xsrc/external/mit/xorg-server/include/dix-config.h  1.26 (patch)
xsrc/external/mit/xorg-server/include/dix-config.h  1.27 (patch)

Apply upstream fixes for generation and comparision of
MIT-MAGIC-COOKIES, fixing CVE-2017-2624
[mrg, ticket #1381]


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8.6.1 -r1.1.1.8.6.2 \
xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.6.1 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
cvs rdiff -u -r1.6 -r1.6.6.1 xsrc/external/mit/xorg-server/dist/include/os.h
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.6.1 \
xsrc/external/mit/xorg-server/dist/os/auth.c \
xsrc/external/mit/xorg-server/dist/os/xdmauth.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.6.1 \
xsrc/external/mit/xorg-server/dist/os/mitauth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.6.1 \
xsrc/external/mit/xorg-server/dist/os/osdep.h
cvs rdiff -u -r1.1.1.3.6.1 -r1.1.1.3.6.2 \
xsrc/external/mit/xorg-server/dist/os/rpcauth.c
cvs rdiff -u -r0 -r1.1.8.2 \
xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c
cvs rdiff -u -r1.19 -r1.19.6.1 \
xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.5 -r1.5.20.1 xsrc/xfree/xc/programs/Xserver/include/os.h
cvs rdiff -u -r1.4 -r1.4.32.1 xsrc/xfree/xc/programs/Xserver/os/auth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.34.1 \
xsrc/xfree/xc/programs/Xserver/os/mitauth.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.20.1 \
xsrc/xfree/xc/programs/Xserver/os/osdep.h
cvs rdiff -u -r1.1.1.5.32.1 -r1.1.1.5.32.2 \
xsrc/xfree/xc/programs/Xserver/os/rpcauth.c
cvs rdiff -u -r0 -r1.1.8.2 \
xsrc/xfree/xc/programs/Xserver/os/timingsafe_memcmp.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.20.1 \
xsrc/xfree/xc/programs/Xserver/os/xdmauth.c

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/configure.ac
diff -u xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.8.6.1 xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.8.6.2
--- xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.8.6.1	Tue Dec  9 19:46:20 2014
+++ xsrc/external/mit/xorg-server/dist/configure.ac	Wed Mar  8 14:49:58 2017
@@ -220,6 +220,8 @@ AC_CHECK_FUNC([strlcpy], AC_DEFINE(HAS_S
 
 AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF =

CVS commit: [netbsd-6] src/doc

2017-03-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Mar  8 14:48:52 UTC 2017

Modified Files:
src/doc [netbsd-6]: CHANGES-6.2

Log Message:
Ticket #1381


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.276 -r1.1.2.277 src/doc/CHANGES-6.2

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

Modified files:

Index: src/doc/CHANGES-6.2
diff -u src/doc/CHANGES-6.2:1.1.2.276 src/doc/CHANGES-6.2:1.1.2.277
--- src/doc/CHANGES-6.2:1.1.2.276	Wed Mar  8 00:38:33 2017
+++ src/doc/CHANGES-6.2	Wed Mar  8 14:48:52 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.2,v 1.1.2.276 2017/03/08 00:38:33 snj Exp $
+# $NetBSD: CHANGES-6.2,v 1.1.2.277 2017/03/08 14:48:52 martin Exp $
 
 A complete list of changes from the 6.1 release until the 6.2 release:
 
@@ -16418,3 +16418,39 @@ x11/lib/ICE/Makefilepatch
 	(80f62c54fbd50a3bbdf9c37258525098c9117830 upstream)
 	[mrg, ticket #1442]
 
+xsrc/external/mit/xorg-server.old/dist/configure.ac	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/os.h	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/auth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/auth.c	1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/mitauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/mitauth.c	1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/osdep.h	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/rpcauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/timingsafe_memcmp.c 1.1 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/xdmauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/include/dix-config.h 1.3 (patch)
+xsrc/external/mit/xorg-server.old/include/dix-config.h 1.4 (patch)
+xsrc/external/mit/xorg-server/dist/configure.ac	1.4 (patch)
+xsrc/external/mit/xorg-server/dist/configure.ac	1.5 (patch)
+xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.2 (patch)
+xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.3 (patch)
+xsrc/external/mit/xorg-server/dist/include/os.h	1.8 (patch)
+xsrc/external/mit/xorg-server/dist/os/auth.c		1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/auth.c		1.3 (patch)
+xsrc/external/mit/xorg-server/dist/os/mitauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/mitauth.c	1.3 (patch)
+xsrc/external/mit/xorg-server/dist/os/osdep.h	1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/rpcauth.c	1.4 (patch)
+xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c 1.1 (patch)
+xsrc/external/mit/xorg-server/dist/os/xdmauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server/include/dix-config.h	1.26 (patch)
+xsrc/external/mit/xorg-server/include/dix-config.h	1.27 (patch)
+external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 (patch)
+external/mit/xorg/server/xorg-server/os/Makefile 1.15 (patch)
+
+	Apply upstream fixes for generation and comparision of
+	MIT-MAGIC-COOKIES, fixing CVE-2017-2624
+	[mrg, ticket #1381]
+

CVS commit: [netbsd-6] src

2017-03-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Mar  8 14:48:16 UTC 2017

Modified Files:
src/external/mit/xorg/server/xorg-server/os [netbsd-6]: Makefile
src/x11/Xserver/os [netbsd-6]: Makefile

Log Message:
external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 (patch)
external/mit/xorg/server/xorg-server/os/Makefile 1.15 (patch)

Apply upstream fixes for generation and comparision of
MIT-MAGIC-COOKIES, fixing CVE-2017-2624
[mrg, ticket #1381]


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.4.1 \
src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.18 -r1.18.6.1 src/x11/Xserver/os/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.9 src/external/mit/xorg/server/xorg-server/os/Makefile:1.9.4.1
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.9	Tue Aug  2 09:11:38 2011
+++ src/external/mit/xorg/server/xorg-server/os/Makefile	Wed Mar  8 14:48:15 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.9 2011/08/02 09:11:38 mrg Exp $
+#	$NetBSD: Makefile,v 1.9.4.1 2017/03/08 14:48:15 martin Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -9,7 +9,8 @@ LIB=	os
 SRCS=	WaitFor.c access.c auth.c connection.c io.c mitauth.c \
 	oscolor.c osinit.c utils.c xdmauth.c \
 	xstrans.c xprintf.c log.c xdmcp.c \
-	rpcauth.c backtrace.c xprintf.c xsha1.c
+	rpcauth.c backtrace.c xprintf.c xsha1.c \
+	timingsafe_memcmp.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \

Index: src/x11/Xserver/os/Makefile
diff -u src/x11/Xserver/os/Makefile:1.18 src/x11/Xserver/os/Makefile:1.18.6.1
--- src/x11/Xserver/os/Makefile:1.18	Mon May 30 02:12:02 2011
+++ src/x11/Xserver/os/Makefile	Wed Mar  8 14:48:15 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2011/05/30 02:12:02 christos Exp $
+#	$NetBSD: Makefile,v 1.18.6.1 2017/03/08 14:48:15 martin Exp $
 
 .include "../Makefile.serverlib"
 .include 
@@ -7,7 +7,8 @@ LIB=	os
 .PATH:	${X11SRCDIR.xc}/lib/xtrans
 SRCS=	WaitFor.c access.c connection.c io.c oscolor.c osinit.c \
 	utils.c log.c auth.c mitauth.c secauth.c xdmauth.c xdmcp.c \
-	xdmcp.c transport.c lbxio.c GetTimeInMillis.c
+	xdmcp.c transport.c lbxio.c GetTimeInMillis.c \
+	timingsafe_memcmp.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/include \
 		-I${XSERVERINCDIR} \

CVS commit: [netbsd-6] xsrc

2017-03-08 Thread Martin Husemann

Module Name:xsrc
Committed By:   martin
Date:   Wed Mar  8 14:47:24 UTC 2017

Modified Files:
xsrc/external/mit/xorg-server/dist [netbsd-6]: configure.ac
xsrc/external/mit/xorg-server/dist/include [netbsd-6]: dix-config.h.in
os.h
xsrc/external/mit/xorg-server/dist/os [netbsd-6]: auth.c mitauth.c
osdep.h rpcauth.c xdmauth.c
xsrc/external/mit/xorg-server/include [netbsd-6]: dix-config.h
xsrc/xfree/xc/programs/Xserver/include [netbsd-6]: os.h
xsrc/xfree/xc/programs/Xserver/os [netbsd-6]: auth.c mitauth.c osdep.h
rpcauth.c xdmauth.c
Added Files:
xsrc/external/mit/xorg-server/dist/os [netbsd-6]: timingsafe_memcmp.c
xsrc/xfree/xc/programs/Xserver/os [netbsd-6]: timingsafe_memcmp.c

Log Message:
xsrc/external/mit/xorg-server.old/dist/configure.ac 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/include/os.h 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/auth.c1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/auth.c1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/os/mitauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/mitauth.c 1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/os/osdep.h   1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/rpcauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/timingsafe_memcmp.c 1.1 (patch)
xsrc/external/mit/xorg-server.old/dist/os/xdmauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/include/dix-config.h 1.3 (patch)
xsrc/external/mit/xorg-server.old/include/dix-config.h 1.4 (patch)
xsrc/external/mit/xorg-server/dist/configure.ac 1.4 (patch)
xsrc/external/mit/xorg-server/dist/configure.ac 1.5 (patch)
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.2 (patch)
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.3 (patch)
xsrc/external/mit/xorg-server/dist/include/os.h 1.8 (patch)
xsrc/external/mit/xorg-server/dist/os/auth.c1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/auth.c1.3 (patch)
xsrc/external/mit/xorg-server/dist/os/mitauth.c 1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/mitauth.c 1.3 (patch)
xsrc/external/mit/xorg-server/dist/os/osdep.h   1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/rpcauth.c 1.4 (patch)
xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c 1.1 (patch)
xsrc/external/mit/xorg-server/dist/os/xdmauth.c 1.2 (patch)
xsrc/external/mit/xorg-server/include/dix-config.h  1.26 (patch)
xsrc/external/mit/xorg-server/include/dix-config.h  1.27 (patch)

Apply upstream fixes for generation and comparision of
MIT-MAGIC-COOKIES, fixing CVE-2017-2624
[mrg, ticket #1381]


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.8.2.1 -r1.1.1.8.2.2 \
xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
cvs rdiff -u -r1.6 -r1.6.2.1 xsrc/external/mit/xorg-server/dist/include/os.h
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \
xsrc/external/mit/xorg-server/dist/os/auth.c \
xsrc/external/mit/xorg-server/dist/os/xdmauth.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \
xsrc/external/mit/xorg-server/dist/os/mitauth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 \
xsrc/external/mit/xorg-server/dist/os/osdep.h
cvs rdiff -u -r1.1.1.3.2.1 -r1.1.1.3.2.2 \
xsrc/external/mit/xorg-server/dist/os/rpcauth.c
cvs rdiff -u -r0 -r1.1.6.2 \
xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c
cvs rdiff -u -r1.19 -r1.19.2.1 \
xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.5 -r1.5.14.1 xsrc/xfree/xc/programs/Xserver/include/os.h
cvs rdiff -u -r1.4 -r1.4.26.1 xsrc/xfree/xc/programs/Xserver/os/auth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.28.1 \
xsrc/xfree/xc/programs/Xserver/os/mitauth.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.14.1 \
xsrc/xfree/xc/programs/Xserver/os/osdep.h
cvs rdiff -u -r1.1.1.5.26.1 -r1.1.1.5.26.2 \
xsrc/xfree/xc/programs/Xserver/os/rpcauth.c
cvs rdiff -u -r0 -r1.1.6.2 \
xsrc/xfree/xc/programs/Xserver/os/timingsafe_memcmp.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.14.1 \
xsrc/xfree/xc/programs/Xserver/os/xdmauth.c

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/configure.ac
diff -u xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.8.2.1 xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.8.2.2
--- xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.8.2.1	Tue Dec  9 19:43:12 2014
+++ xsrc/external/mit/xorg-server/dist/configure.ac	Wed Mar  8 14:47:24 2017
@@ -220,6 +220,8 @@ AC_CHECK_FUNC([strlcpy], AC_DEFINE(HAS_S
 
 AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno])

CVS commit: [netbsd-7-0] src/doc

2017-03-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Mar  8 14:31:09 UTC 2017

Modified Files:
src/doc [netbsd-7-0]: CHANGES-7.0.3

Log Message:
Ticket #1381


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-7.0.3

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

Modified files:

Index: src/doc/CHANGES-7.0.3
diff -u src/doc/CHANGES-7.0.3:1.1.2.32 src/doc/CHANGES-7.0.3:1.1.2.33
--- src/doc/CHANGES-7.0.3:1.1.2.32	Tue Mar  7 20:20:24 2017
+++ src/doc/CHANGES-7.0.3	Wed Mar  8 14:31:09 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.0.3,v 1.1.2.32 2017/03/07 20:20:24 snj Exp $
+# $NetBSD: CHANGES-7.0.3,v 1.1.2.33 2017/03/08 14:31:09 martin Exp $
 
 A complete list of changes from the NetBSD 7.0.2 release to the NetBSD 7.0.3
 release:
@@ -1276,3 +1276,39 @@ x11/lib/ICE/Makefilepatch
 	(80f62c54fbd50a3bbdf9c37258525098c9117830 upstream)
 	[mrg, ticket #1380]
 
+xsrc/external/mit/xorg-server.old/dist/configure.ac	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/os.h	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/auth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/auth.c	1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/mitauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/mitauth.c	1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/osdep.h	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/rpcauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/timingsafe_memcmp.c 1.1 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/xdmauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/include/dix-config.h 1.3 (patch)
+xsrc/external/mit/xorg-server.old/include/dix-config.h 1.4 (patch)
+xsrc/external/mit/xorg-server/dist/configure.ac	1.4 (patch)
+xsrc/external/mit/xorg-server/dist/configure.ac	1.5 (patch)
+xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.2 (patch)
+xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.3 (patch)
+xsrc/external/mit/xorg-server/dist/include/os.h	1.8 (patch)
+xsrc/external/mit/xorg-server/dist/os/auth.c		1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/auth.c		1.3 (patch)
+xsrc/external/mit/xorg-server/dist/os/mitauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/mitauth.c	1.3 (patch)
+xsrc/external/mit/xorg-server/dist/os/osdep.h	1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/rpcauth.c	1.4 (patch)
+xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c 1.1 (patch)
+xsrc/external/mit/xorg-server/dist/os/xdmauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server/include/dix-config.h	1.26 (patch)
+xsrc/external/mit/xorg-server/include/dix-config.h	1.27 (patch)
+external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 (patch)
+external/mit/xorg/server/xorg-server/os/Makefile 1.15 (patch)
+
+	Apply upstream fixes for generation and comparision of
+	MIT-MAGIC-COOKIES, fixing CVE-2017-2624
+	[mrg, ticket #1381]
+

CVS commit: [netbsd-7-0] src

2017-03-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Mar  8 14:30:31 UTC 2017

Modified Files:
src/external/mit/xorg/server/xorg-server/os [netbsd-7-0]: Makefile
src/x11/Xserver/os [netbsd-7-0]: Makefile

Log Message:
external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 (patch)
external/mit/xorg/server/xorg-server/os/Makefile 1.15 (patch)

Apply upstream fixes for generation and comparision of
MIT-MAGIC-COOKIES, fixing CVE-2017-2624
[mrg, ticket #1381]


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.4.1 \
src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.18 -r1.18.24.1 src/x11/Xserver/os/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.10 src/external/mit/xorg/server/xorg-server/os/Makefile:1.10.4.1
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.10	Sun Aug 10 14:43:03 2014
+++ src/external/mit/xorg/server/xorg-server/os/Makefile	Wed Mar  8 14:30:31 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2014/08/10 14:43:03 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.10.4.1 2017/03/08 14:30:31 martin Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -9,7 +9,8 @@ LIB=	os
 SRCS=	WaitFor.c access.c auth.c connection.c io.c mitauth.c \
 	oscolor.c osinit.c utils.c xdmauth.c \
 	xstrans.c xprintf.c log.c xdmcp.c \
-	rpcauth.c backtrace.c xprintf.c xsha1.c
+	rpcauth.c backtrace.c xprintf.c xsha1.c \
+	timingsafe_memcmp.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \

Index: src/x11/Xserver/os/Makefile
diff -u src/x11/Xserver/os/Makefile:1.18 src/x11/Xserver/os/Makefile:1.18.24.1
--- src/x11/Xserver/os/Makefile:1.18	Mon May 30 02:12:02 2011
+++ src/x11/Xserver/os/Makefile	Wed Mar  8 14:30:31 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2011/05/30 02:12:02 christos Exp $
+#	$NetBSD: Makefile,v 1.18.24.1 2017/03/08 14:30:31 martin Exp $
 
 .include "../Makefile.serverlib"
 .include 
@@ -7,7 +7,8 @@ LIB=	os
 .PATH:	${X11SRCDIR.xc}/lib/xtrans
 SRCS=	WaitFor.c access.c connection.c io.c oscolor.c osinit.c \
 	utils.c log.c auth.c mitauth.c secauth.c xdmauth.c xdmcp.c \
-	xdmcp.c transport.c lbxio.c GetTimeInMillis.c
+	xdmcp.c transport.c lbxio.c GetTimeInMillis.c \
+	timingsafe_memcmp.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/include \
 		-I${XSERVERINCDIR} \

CVS commit: [netbsd-7-0] xsrc

2017-03-08 Thread Martin Husemann

Module Name:xsrc
Committed By:   martin
Date:   Wed Mar  8 14:29:50 UTC 2017

Modified Files:
xsrc/external/mit/xorg-server/dist [netbsd-7-0]: configure.ac
xsrc/external/mit/xorg-server/dist/include [netbsd-7-0]:
dix-config.h.in os.h
xsrc/external/mit/xorg-server/dist/os [netbsd-7-0]: auth.c mitauth.c
osdep.h rpcauth.c xdmauth.c
xsrc/external/mit/xorg-server/include [netbsd-7-0]: dix-config.h
xsrc/xfree/xc/programs/Xserver/include [netbsd-7-0]: os.h
xsrc/xfree/xc/programs/Xserver/os [netbsd-7-0]: auth.c mitauth.c
osdep.h rpcauth.c xdmauth.c
Added Files:
xsrc/external/mit/xorg-server/dist/os [netbsd-7-0]: timingsafe_memcmp.c
xsrc/xfree/xc/programs/Xserver/os [netbsd-7-0]: timingsafe_memcmp.c

Log Message:
xsrc/external/mit/xorg-server.old/dist/configure.ac 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/include/os.h 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/auth.c1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/auth.c1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/os/mitauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/mitauth.c 1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/os/osdep.h   1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/rpcauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/timingsafe_memcmp.c 1.1 (patch)
xsrc/external/mit/xorg-server.old/dist/os/xdmauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/include/dix-config.h 1.3 (patch)
xsrc/external/mit/xorg-server.old/include/dix-config.h 1.4 (patch)
xsrc/external/mit/xorg-server/dist/configure.ac 1.4 (patch)
xsrc/external/mit/xorg-server/dist/configure.ac 1.5 (patch)
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.2 (patch)
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.3 (patch)
xsrc/external/mit/xorg-server/dist/include/os.h 1.8 (patch)
xsrc/external/mit/xorg-server/dist/os/auth.c1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/auth.c1.3 (patch)
xsrc/external/mit/xorg-server/dist/os/mitauth.c 1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/mitauth.c 1.3 (patch)
xsrc/external/mit/xorg-server/dist/os/osdep.h   1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/rpcauth.c 1.4 (patch)
xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c 1.1 (patch)
xsrc/external/mit/xorg-server/dist/os/xdmauth.c 1.2 (patch)
xsrc/external/mit/xorg-server/include/dix-config.h  1.26 (patch)
xsrc/external/mit/xorg-server/include/dix-config.h  1.27 (patch)

Apply upstream fixes for generation and comparision of
MIT-MAGIC-COOKIES, fixing CVE-2017-2624
[mrg, ticket #1381]


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.9.4.1 -r1.1.1.9.4.1.2.1 \
xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.12.1 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
cvs rdiff -u -r1.6 -r1.6.12.1 xsrc/external/mit/xorg-server/dist/include/os.h
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.12.1 \
xsrc/external/mit/xorg-server/dist/os/auth.c \
xsrc/external/mit/xorg-server/dist/os/xdmauth.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.12.1 \
xsrc/external/mit/xorg-server/dist/os/mitauth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.12.1 \
xsrc/external/mit/xorg-server/dist/os/osdep.h
cvs rdiff -u -r1.1.1.3.10.1 -r1.1.1.3.10.1.2.1 \
xsrc/external/mit/xorg-server/dist/os/rpcauth.c
cvs rdiff -u -r0 -r1.1.4.2 \
xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c
cvs rdiff -u -r1.20 -r1.20.6.1 \
xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.5 -r1.5.26.1 xsrc/xfree/xc/programs/Xserver/include/os.h
cvs rdiff -u -r1.4 -r1.4.38.1 xsrc/xfree/xc/programs/Xserver/os/auth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.40.1 \
xsrc/xfree/xc/programs/Xserver/os/mitauth.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.26.1 \
xsrc/xfree/xc/programs/Xserver/os/osdep.h
cvs rdiff -u -r1.1.1.5.36.1 -r1.1.1.5.36.1.2.1 \
xsrc/xfree/xc/programs/Xserver/os/rpcauth.c
cvs rdiff -u -r0 -r1.1.4.2 \
xsrc/xfree/xc/programs/Xserver/os/timingsafe_memcmp.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.26.1 \
xsrc/xfree/xc/programs/Xserver/os/xdmauth.c

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/configure.ac
diff -u xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.9.4.1 xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.9.4.1.2.1
--- xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.9.4.1	Tue Dec  9 19:36:57 2014
+++ xsrc/external/mit/xorg-server/dist/configure.ac	Wed Mar  8 14:29:50 2017
@@ -220,6 +220,8 @@ AC_CHECK_FUNC([strlcpy], AC_DEFINE(HAS_S
 
 AM_CONDITIONAL(NEED_VSNPRINTF, [test

CVS commit: [netbsd-7] src/doc

2017-03-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Mar  8 14:22:55 UTC 2017

Modified Files:
src/doc [netbsd-7]: CHANGES-7.1

Log Message:
Ticket #1381


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.159 -r1.1.2.160 src/doc/CHANGES-7.1

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

Modified files:

Index: src/doc/CHANGES-7.1
diff -u src/doc/CHANGES-7.1:1.1.2.159 src/doc/CHANGES-7.1:1.1.2.160
--- src/doc/CHANGES-7.1:1.1.2.159	Tue Mar  7 20:36:55 2017
+++ src/doc/CHANGES-7.1	Wed Mar  8 14:22:55 2017
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.159 2017/03/07 20:36:55 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.160 2017/03/08 14:22:55 martin Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -8911,3 +8911,39 @@ sys/arch/xen/xen/hypervisor.c			1.67
 	add machdep.xen.version sysctl to easily get hypervisor version
 	[jnmeth, ticket #1328]
 
+xsrc/external/mit/xorg-server.old/dist/configure.ac	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/include/os.h	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/auth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/auth.c	1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/mitauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/mitauth.c	1.3 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/osdep.h	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/rpcauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/timingsafe_memcmp.c 1.1 (patch)
+xsrc/external/mit/xorg-server.old/dist/os/xdmauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server.old/include/dix-config.h 1.3 (patch)
+xsrc/external/mit/xorg-server.old/include/dix-config.h 1.4 (patch)
+xsrc/external/mit/xorg-server/dist/configure.ac	1.4 (patch)
+xsrc/external/mit/xorg-server/dist/configure.ac	1.5 (patch)
+xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.2 (patch)
+xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.3 (patch)
+xsrc/external/mit/xorg-server/dist/include/os.h	1.8 (patch)
+xsrc/external/mit/xorg-server/dist/os/auth.c		1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/auth.c		1.3 (patch)
+xsrc/external/mit/xorg-server/dist/os/mitauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/mitauth.c	1.3 (patch)
+xsrc/external/mit/xorg-server/dist/os/osdep.h	1.2 (patch)
+xsrc/external/mit/xorg-server/dist/os/rpcauth.c	1.4 (patch)
+xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c 1.1 (patch)
+xsrc/external/mit/xorg-server/dist/os/xdmauth.c	1.2 (patch)
+xsrc/external/mit/xorg-server/include/dix-config.h	1.26 (patch)
+xsrc/external/mit/xorg-server/include/dix-config.h	1.27 (patch)
+external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 (patch)
+external/mit/xorg/server/xorg-server/os/Makefile 1.15 (patch)
+
+	Apply upstream fixes for generation and comparision of
+	MIT-MAGIC-COOKIES, fixing CVE-2017-2624
+	[mrg, ticket #1381]
+

CVS commit: [netbsd-7] src

2017-03-08 Thread Martin Husemann

Module Name:src
Committed By:   martin
Date:   Wed Mar  8 14:22:12 UTC 2017

Modified Files:
src/external/mit/xorg/server/xorg-server/os [netbsd-7]: Makefile
src/x11/Xserver/os [netbsd-7]: Makefile

Log Message:
external/mit/xorg/server/xorg-server.old/os/Makefile 1.2 (patch)
external/mit/xorg/server/xorg-server/os/Makefile 1.15 (patch)

Apply upstream fixes for generation and comparision of
MIT-MAGIC-COOKIES, fixing CVE-2017-2624
[mrg, ticket #1381]


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.10.2.1 \
src/external/mit/xorg/server/xorg-server/os/Makefile
cvs rdiff -u -r1.18 -r1.18.22.1 src/x11/Xserver/os/Makefile

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

Modified files:

Index: src/external/mit/xorg/server/xorg-server/os/Makefile
diff -u src/external/mit/xorg/server/xorg-server/os/Makefile:1.10 src/external/mit/xorg/server/xorg-server/os/Makefile:1.10.2.1
--- src/external/mit/xorg/server/xorg-server/os/Makefile:1.10	Sun Aug 10 14:43:03 2014
+++ src/external/mit/xorg/server/xorg-server/os/Makefile	Wed Mar  8 14:22:12 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.10 2014/08/10 14:43:03 jmcneill Exp $
+#	$NetBSD: Makefile,v 1.10.2.1 2017/03/08 14:22:12 martin Exp $
 
 .include "../Makefile.serverlib"
 .include "../Makefile.servermod"
@@ -9,7 +9,8 @@ LIB=	os
 SRCS=	WaitFor.c access.c auth.c connection.c io.c mitauth.c \
 	oscolor.c osinit.c utils.c xdmauth.c \
 	xstrans.c xprintf.c log.c xdmcp.c \
-	rpcauth.c backtrace.c xprintf.c xsha1.c
+	rpcauth.c backtrace.c xprintf.c xsha1.c \
+	timingsafe_memcmp.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xorg-server}/include \
 		-I${DESTDIR}${X11INCDIR}/X11 \

Index: src/x11/Xserver/os/Makefile
diff -u src/x11/Xserver/os/Makefile:1.18 src/x11/Xserver/os/Makefile:1.18.22.1
--- src/x11/Xserver/os/Makefile:1.18	Mon May 30 02:12:02 2011
+++ src/x11/Xserver/os/Makefile	Wed Mar  8 14:22:12 2017
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.18 2011/05/30 02:12:02 christos Exp $
+#	$NetBSD: Makefile,v 1.18.22.1 2017/03/08 14:22:12 martin Exp $
 
 .include "../Makefile.serverlib"
 .include 
@@ -7,7 +7,8 @@ LIB=	os
 .PATH:	${X11SRCDIR.xc}/lib/xtrans
 SRCS=	WaitFor.c access.c connection.c io.c oscolor.c osinit.c \
 	utils.c log.c auth.c mitauth.c secauth.c xdmauth.c xdmcp.c \
-	xdmcp.c transport.c lbxio.c GetTimeInMillis.c
+	xdmcp.c transport.c lbxio.c GetTimeInMillis.c \
+	timingsafe_memcmp.c
 
 CPPFLAGS+=	-I${X11SRCDIR.xc}/programs/Xserver/include \
 		-I${XSERVERINCDIR} \

CVS commit: [netbsd-7] xsrc

2017-03-08 Thread Martin Husemann

Module Name:xsrc
Committed By:   martin
Date:   Wed Mar  8 14:20:07 UTC 2017

Modified Files:
xsrc/external/mit/xorg-server/dist [netbsd-7]: configure.ac
xsrc/external/mit/xorg-server/dist/include [netbsd-7]: dix-config.h.in
os.h
xsrc/external/mit/xorg-server/dist/os [netbsd-7]: auth.c mitauth.c
osdep.h rpcauth.c xdmauth.c
xsrc/external/mit/xorg-server/include [netbsd-7]: dix-config.h
xsrc/xfree/xc/programs/Xserver/include [netbsd-7]: os.h
xsrc/xfree/xc/programs/Xserver/os [netbsd-7]: auth.c mitauth.c osdep.h
rpcauth.c xdmauth.c
Added Files:
xsrc/external/mit/xorg-server/dist/os [netbsd-7]: timingsafe_memcmp.c
xsrc/xfree/xc/programs/Xserver/os [netbsd-7]: timingsafe_memcmp.c

Log Message:
xsrc/external/mit/xorg-server.old/dist/configure.ac 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/include/dix-config.h.in 1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/include/os.h 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/auth.c1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/auth.c1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/os/mitauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/mitauth.c 1.3 (patch)
xsrc/external/mit/xorg-server.old/dist/os/osdep.h   1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/rpcauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/dist/os/timingsafe_memcmp.c 1.1 (patch)
xsrc/external/mit/xorg-server.old/dist/os/xdmauth.c 1.2 (patch)
xsrc/external/mit/xorg-server.old/include/dix-config.h 1.3 (patch)
xsrc/external/mit/xorg-server.old/include/dix-config.h 1.4 (patch)
xsrc/external/mit/xorg-server/dist/configure.ac 1.4 (patch)
xsrc/external/mit/xorg-server/dist/configure.ac 1.5 (patch)
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.2 (patch)
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in 1.3 (patch)
xsrc/external/mit/xorg-server/dist/include/os.h 1.8 (patch)
xsrc/external/mit/xorg-server/dist/os/auth.c1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/auth.c1.3 (patch)
xsrc/external/mit/xorg-server/dist/os/mitauth.c 1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/mitauth.c 1.3 (patch)
xsrc/external/mit/xorg-server/dist/os/osdep.h   1.2 (patch)
xsrc/external/mit/xorg-server/dist/os/rpcauth.c 1.4 (patch)
xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c 1.1 (patch)
xsrc/external/mit/xorg-server/dist/os/xdmauth.c 1.2 (patch)
xsrc/external/mit/xorg-server/include/dix-config.h  1.26 (patch)
xsrc/external/mit/xorg-server/include/dix-config.h  1.27 (patch)

Apply upstream fixes for generation and comparision of
MIT-MAGIC-COOKIES, fixing CVE-2017-2624
[mrg, ticket #1381]


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.9.4.1 -r1.1.1.9.4.2 \
xsrc/external/mit/xorg-server/dist/configure.ac
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/include/dix-config.h.in
cvs rdiff -u -r1.6 -r1.6.10.1 xsrc/external/mit/xorg-server/dist/include/os.h
cvs rdiff -u -r1.1.1.3 -r1.1.1.3.10.1 \
xsrc/external/mit/xorg-server/dist/os/auth.c \
xsrc/external/mit/xorg-server/dist/os/xdmauth.c
cvs rdiff -u -r1.1.1.2 -r1.1.1.2.10.1 \
xsrc/external/mit/xorg-server/dist/os/mitauth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.10.1 \
xsrc/external/mit/xorg-server/dist/os/osdep.h
cvs rdiff -u -r1.1.1.3.10.1 -r1.1.1.3.10.2 \
xsrc/external/mit/xorg-server/dist/os/rpcauth.c
cvs rdiff -u -r0 -r1.1.2.2 \
xsrc/external/mit/xorg-server/dist/os/timingsafe_memcmp.c
cvs rdiff -u -r1.20 -r1.20.4.1 \
xsrc/external/mit/xorg-server/include/dix-config.h
cvs rdiff -u -r1.5 -r1.5.24.1 xsrc/xfree/xc/programs/Xserver/include/os.h
cvs rdiff -u -r1.4 -r1.4.36.1 xsrc/xfree/xc/programs/Xserver/os/auth.c
cvs rdiff -u -r1.1.1.4 -r1.1.1.4.38.1 \
xsrc/xfree/xc/programs/Xserver/os/mitauth.c
cvs rdiff -u -r1.1.1.7 -r1.1.1.7.24.1 \
xsrc/xfree/xc/programs/Xserver/os/osdep.h
cvs rdiff -u -r1.1.1.5.36.1 -r1.1.1.5.36.2 \
xsrc/xfree/xc/programs/Xserver/os/rpcauth.c
cvs rdiff -u -r0 -r1.1.2.1 \
xsrc/xfree/xc/programs/Xserver/os/timingsafe_memcmp.c
cvs rdiff -u -r1.1.1.6 -r1.1.1.6.24.1 \
xsrc/xfree/xc/programs/Xserver/os/xdmauth.c

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

Modified files:

Index: xsrc/external/mit/xorg-server/dist/configure.ac
diff -u xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.9.4.1 xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.9.4.2
--- xsrc/external/mit/xorg-server/dist/configure.ac:1.1.1.9.4.1	Tue Dec  9 19:36:57 2014
+++ xsrc/external/mit/xorg-server/dist/configure.ac	Wed Mar  8 14:20:07 2017
@@ -220,6 +220,8 @@ AC_CHECK_FUNC([strlcpy], AC_DEFINE(HAS_S
 
 AM_CONDITIONAL(NEED_VSNPRINTF, [test x$HAVE_VSNPRINTF = xno])

CVS commit: src/sbin/scsictl

2017-03-08 Thread Izumi Tsutsui

Module Name:src
Committed By:   tsutsui
Date:   Wed Mar  8 11:45:14 UTC 2017

Modified Files:
src/sbin/scsictl: scsictl.8

Log Message:
Fix format.


To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sbin/scsictl/scsictl.8

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

Modified files:

Index: src/sbin/scsictl/scsictl.8
diff -u src/sbin/scsictl/scsictl.8:1.30 src/sbin/scsictl/scsictl.8:1.31
--- src/sbin/scsictl/scsictl.8:1.30	Sun Nov 20 09:38:11 2016
+++ src/sbin/scsictl/scsictl.8	Wed Mar  8 11:45:14 2017
@@ -1,4 +1,4 @@
-.\"	$NetBSD: scsictl.8,v 1.30 2016/11/20 09:38:11 wiz Exp $
+.\"	$NetBSD: scsictl.8,v 1.31 2017/03/08 11:45:14 tsutsui Exp $
 .\"
 .\" Copyright (c) 1998, 2002 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -123,7 +123,7 @@ a few years ago do not support this opti
 Identify the specified device, displaying the device's SCSI
 bus, target, and lun, as well as the device's vendor, product,
 and revision strings.
-.Cm It reassign Ar blkno Oo blkno Oo ... Oc Oc
+.It Cm reassign Ar blkno Oo blkno Oo ... Oc Oc
 Issues a
 .Li REASSIGN BLOCKS
 command to the device, adding the specified blocks to the

CVS commit: src/sys/dev/pci

2017-03-08 Thread Frank Kardel

Module Name:src
Committed By:   kardel
Date:   Wed Mar  8 08:00:09 UTC 2017

Modified Files:
src/sys/dev/pci: if_wm.c

Log Message:
PR kern/52039: use same safeguard as for the 82578


To generate a diff of this commit:
cvs rdiff -u -r1.496 -r1.497 src/sys/dev/pci/if_wm.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/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.496 src/sys/dev/pci/if_wm.c:1.497
--- src/sys/dev/pci/if_wm.c:1.496	Fri Mar  3 16:48:55 2017
+++ src/sys/dev/pci/if_wm.c	Wed Mar  8 08:00:09 2017
@@ -1,4 +1,4 @@
-/*	$NetBSD: if_wm.c,v 1.496 2017/03/03 16:48:55 knakahara Exp $	*/
+/*	$NetBSD: if_wm.c,v 1.497 2017/03/08 08:00:09 kardel Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -84,7 +84,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.496 2017/03/03 16:48:55 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.497 2017/03/08 08:00:09 kardel Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_net_mpsafe.h"
@@ -13178,7 +13178,7 @@ wm_enable_wakeup(struct wm_softc *sc)
 
 			/* Assume that the PHY is copper */
 			child = LIST_FIRST(>sc_mii.mii_phys);
-			if (child->mii_mpd_rev <= 2)
+			if ((child != NULL) && (child->mii_mpd_rev <= 2))
 sc->sc_mii.mii_writereg(sc->sc_dev, 1,
 (768 << 5) | 25, 0x0444); /* magic num */
 		}

44 matches

Mail list logo