head	1.2;
access;
symbols
	pkgsrc-2020Q2:1.1.0.38
	pkgsrc-2020Q2-base:1.1
	pkgsrc-2020Q1:1.1.0.18
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.40
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.36
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.34
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.32
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.30
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.28
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.26
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.24
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.22
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.20
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.16
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.14
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.12
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.10
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.8
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.6
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.4
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2020.08.19.10.39.23;	author bouyer;	state dead;
branches;
next	1.1;
commitid	DGAMglRf0Jde6FkC;

1.1
date	2015.10.29.21.59.16;	author bouyer;	state Exp;
branches
	1.1.2.1;
next	;
commitid	DIh06OW9uuOkj3Hy;

1.1.2.1
date	2015.10.29.21.59.16;	author bsiegert;	state dead;
branches;
next	1.1.2.2;
commitid	Cxh3auEI8v6qtOHy;

1.1.2.2
date	2015.11.04.20.02.32;	author bsiegert;	state Exp;
branches;
next	;
commitid	Cxh3auEI8v6qtOHy;


desc
@@


1.2
log
@Remove xenkernel and xentools packages older than 4.11.
They're not maintained anymore upstream, and don't build on supported NetBSD
releases.
@
text
@$NetBSD: patch-CVE-2015-7835,v 1.1 2015/10/29 21:59:16 bouyer Exp $

Patch for CVE-2015-7835 aka XSA-148 based on
http://xenbits.xenproject.org/xsa/xsa148-4.4.patch

--- xen/arch/x86/mm.c.orig	2014-09-02 08:22:57.000000000 +0200
+++ xen/arch/x86/mm.c	2015-10-29 22:27:31.000000000 +0100
@@@@ -169,7 +169,10 @@@@
 
 static uint32_t base_disallow_mask;
 #define L1_DISALLOW_MASK (base_disallow_mask | _PAGE_GNTTAB)
-#define L2_DISALLOW_MASK (base_disallow_mask & ~_PAGE_PSE)
+
+#define L2_DISALLOW_MASK (unlikely(opt_allow_superpage) \
+                          ? base_disallow_mask & ~_PAGE_PSE \
+                          : base_disallow_mask)
 
 #if defined(__x86_64__)
 
@@@@ -1980,7 +1983,10 @@@@
         }
 
         /* Fast path for identical mapping and presence. */
-        if ( !l2e_has_changed(ol2e, nl2e, _PAGE_PRESENT) )
+        if ( !l2e_has_changed(ol2e, nl2e,
+                              unlikely(opt_allow_superpage)
+                              ? _PAGE_PSE | _PAGE_RW | _PAGE_PRESENT
+                              : _PAGE_PRESENT) )
         {
             adjust_guest_l2e(nl2e, d);
             if ( UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, pfn, vcpu, preserve_ad) )
@


1.1
log
@Add patches, derived from Xen security advisory, fixing:
CVE-2015-7835 aka XSA-148
CVE-2015-7869 aka XSA-149 + XSA-151
CVE-2015-7971 aka XSA-152
Bump PKGREVISION
@
text
@d1 1
a1 1
$NetBSD: patch-CVE-2015-2752,v 1.1 2015/04/19 13:13:20 spz Exp $
@


1.1.2.1
log
@file patch-CVE-2015-7835 was added on branch pkgsrc-2015Q3 on 2015-11-04 20:02:32 +0000
@
text
@d1 31
@


1.1.2.2
log
@Pullup ticket #4849 - requested by bouyer
sysutils/xenkernel42: security fix

Revisions pulled up:
- sysutils/xenkernel42/Makefile                                 1.18
- sysutils/xenkernel42/distinfo                                 1.17
- sysutils/xenkernel42/patches/patch-CVE-2015-7835              1.1
- sysutils/xenkernel42/patches/patch-CVE-2015-7969              1.1
- sysutils/xenkernel42/patches/patch-CVE-2015-7971              1.1

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Thu Oct 29 21:59:16 UTC 2015

   Modified Files:
   	pkgsrc/sysutils/xenkernel42: Makefile distinfo
   Added Files:
   	pkgsrc/sysutils/xenkernel42/patches: patch-CVE-2015-7835
   	    patch-CVE-2015-7969 patch-CVE-2015-7971

   Log Message:
   Add patches, derived from Xen security advisory, fixing:
   CVE-2015-7835 aka XSA-148
   CVE-2015-7869 aka XSA-149 + XSA-151
   CVE-2015-7971 aka XSA-152
   Bump PKGREVISION
@
text
@a0 31
$NetBSD$

Patch for CVE-2015-7835 aka XSA-148 based on
http://xenbits.xenproject.org/xsa/xsa148-4.4.patch

--- xen/arch/x86/mm.c.orig	2014-09-02 08:22:57.000000000 +0200
+++ xen/arch/x86/mm.c	2015-10-29 22:27:31.000000000 +0100
@@@@ -169,7 +169,10 @@@@
 
 static uint32_t base_disallow_mask;
 #define L1_DISALLOW_MASK (base_disallow_mask | _PAGE_GNTTAB)
-#define L2_DISALLOW_MASK (base_disallow_mask & ~_PAGE_PSE)
+
+#define L2_DISALLOW_MASK (unlikely(opt_allow_superpage) \
+                          ? base_disallow_mask & ~_PAGE_PSE \
+                          : base_disallow_mask)
 
 #if defined(__x86_64__)
 
@@@@ -1980,7 +1983,10 @@@@
         }
 
         /* Fast path for identical mapping and presence. */
-        if ( !l2e_has_changed(ol2e, nl2e, _PAGE_PRESENT) )
+        if ( !l2e_has_changed(ol2e, nl2e,
+                              unlikely(opt_allow_superpage)
+                              ? _PAGE_PSE | _PAGE_RW | _PAGE_PRESENT
+                              : _PAGE_PRESENT) )
         {
             adjust_guest_l2e(nl2e, d);
             if ( UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, pfn, vcpu, preserve_ad) )
@