head 1.2; access; symbols 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 2016.12.29.19.13.02; author wiz; state dead; branches; next 1.1; commitid kFYPk8EnajcmFUzz; 1.1 date 2015.10.29.20.29.56; author bouyer; state Exp; branches 1.1.2.1; next ; commitid PiMumYjtNfJgO2Hy; 1.1.2.1 date 2015.10.29.20.29.56; author bsiegert; state dead; branches; next 1.1.2.2; commitid 665AHWvA1hO4rOHy; 1.1.2.2 date 2015.11.04.19.55.44; author bsiegert; state Exp; branches; next ; commitid 665AHWvA1hO4rOHy; desc @@ 1.2 log @Remove xenkernel and tools versions 3, 33, and 41. As discussed on pkgsrc-users. @ text @$NetBSD: patch-CVE-2015-7835,v 1.1 2015/10/29 20:29:56 bouyer Exp $ Patch for CVE-2015-7835 aka XSA-148 based on http://xenbits.xenproject.org/xsa/xsa148-4.4.patch --- xen/include/asm-x86/x86_32/page.h.orig 2015-10-29 20:35:24.000000000 +0100 +++ xen/include/asm-x86/x86_32/page.h 2015-10-29 20:38:02.000000000 +0100 @@@@ -130,7 +130,9 @@@@ #define BASE_DISALLOW_MASK (0xFFFFF198U & ~_PAGE_NX) #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 ) #define L3_DISALLOW_MASK 0xFFFFF1FEU /* must-be-zero */ #endif /* __X86_32_PAGE_H__ */ --- xen/include/asm-x86/x86_64/page.h.orig 2015-10-29 20:35:36.000000000 +0100 +++ xen/include/asm-x86/x86_64/page.h 2015-10-29 20:37:33.000000000 +0100 @@@@ -167,7 +167,9 @@@@ #define BASE_DISALLOW_MASK (0xFF800198U & ~_PAGE_NX) #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 ) #define L3_DISALLOW_MASK (BASE_DISALLOW_MASK) #define L4_DISALLOW_MASK (BASE_DISALLOW_MASK) --- xen/arch/x86/mm.c.orig 2015-10-29 20:30:55.000000000 +0100 +++ xen/arch/x86/mm.c 2015-10-29 20:32:56.000000000 +0100 @@@@ -1898,7 +1898,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); rc = 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 19:55:44 +0000 @ text @d1 45 @ 1.1.2.2 log @Pullup ticket #4848 - requested by bouyer sysutils/xenkernel41: security fix Revisions pulled up: - sysutils/xenkernel41/Makefile 1.46 - sysutils/xenkernel41/distinfo 1.38 - sysutils/xenkernel41/patches/patch-CVE-2015-7835 1.1 - sysutils/xenkernel41/patches/patch-CVE-2015-7969 1.1 - sysutils/xenkernel41/patches/patch-CVE-2015-7971 1.1 --- Module Name: pkgsrc Committed By: bouyer Date: Thu Oct 29 20:29:56 UTC 2015 Modified Files: pkgsrc/sysutils/xenkernel41: Makefile distinfo Added Files: pkgsrc/sysutils/xenkernel41/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 45 $NetBSD$ Patch for CVE-2015-7835 aka XSA-148 based on http://xenbits.xenproject.org/xsa/xsa148-4.4.patch --- xen/include/asm-x86/x86_32/page.h.orig 2015-10-29 20:35:24.000000000 +0100 +++ xen/include/asm-x86/x86_32/page.h 2015-10-29 20:38:02.000000000 +0100 @@@@ -130,7 +130,9 @@@@ #define BASE_DISALLOW_MASK (0xFFFFF198U & ~_PAGE_NX) #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 ) #define L3_DISALLOW_MASK 0xFFFFF1FEU /* must-be-zero */ #endif /* __X86_32_PAGE_H__ */ --- xen/include/asm-x86/x86_64/page.h.orig 2015-10-29 20:35:36.000000000 +0100 +++ xen/include/asm-x86/x86_64/page.h 2015-10-29 20:37:33.000000000 +0100 @@@@ -167,7 +167,9 @@@@ #define BASE_DISALLOW_MASK (0xFF800198U & ~_PAGE_NX) #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 ) #define L3_DISALLOW_MASK (BASE_DISALLOW_MASK) #define L4_DISALLOW_MASK (BASE_DISALLOW_MASK) --- xen/arch/x86/mm.c.orig 2015-10-29 20:30:55.000000000 +0100 +++ xen/arch/x86/mm.c 2015-10-29 20:32:56.000000000 +0100 @@@@ -1898,7 +1898,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); rc = UPDATE_ENTRY(l2, pl2e, ol2e, nl2e, pfn, vcpu, preserve_ad); @