head	1.2;
access;
symbols
	pkgsrc-2016Q4:1.1.0.52
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.50
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.48
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.46
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.44
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.42
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.40
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.38
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.36
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.34
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.32
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.30
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.28
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.26
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.24
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.22
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.20
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.18
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.16
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.14
	pkgsrc-2012Q1-base:1.1
	pkgsrc-2011Q4:1.1.0.12
	pkgsrc-2011Q4-base:1.1
	pkgsrc-2011Q3:1.1.0.10
	pkgsrc-2011Q3-base:1.1
	pkgsrc-2011Q2:1.1.0.8
	pkgsrc-2011Q2-base:1.1
	pkgsrc-2011Q1:1.1.0.6
	pkgsrc-2011Q1-base:1.1
	pkgsrc-2010Q4:1.1.0.4
	pkgsrc-2010Q4-base:1.1
	pkgsrc-2010Q3:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2016.12.29.19.13.01;	author wiz;	state dead;
branches;
next	1.1;
commitid	kFYPk8EnajcmFUzz;

1.1
date	2010.12.07.18.43.49;	author bouyer;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2010.12.07.18.43.49;	author tron;	state dead;
branches;
next	1.1.2.2;

1.1.2.2
date	2010.12.10.10.48.46;	author tron;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Remove xenkernel and tools versions 3, 33, and 41.

As discussed on pkgsrc-users.
@
text
@$NetBSD: patch-dc,v 1.1 2010/12/07 18:43:49 bouyer Exp $

Fix for CVE-2010-4255, from the xen-devel list and adapted for Xen 3.1

--- xen/arch/x86/traps.c.orig	2010-12-07 12:53:20.000000000 +0100
+++ xen/arch/x86/traps.c	2010-12-07 13:11:36.000000000 +0100
@@@@ -950,7 +950,8 @@@@
     {
         if ( paging_mode_external(d) && guest_mode(regs) )
             return paging_fault(addr, regs);
-        if ( (addr >= GDT_LDT_VIRT_START) && (addr < GDT_LDT_VIRT_END) )
+        if ( !(regs->error_code & PFEC_user_mode) &&
+	     (addr >= GDT_LDT_VIRT_START) && (addr < GDT_LDT_VIRT_END) )
             return handle_gdt_ldt_mapping_fault(
                 addr - GDT_LDT_VIRT_START, regs);
         return 0;
@


1.1
log
@Add a fix for CVE-2010-4255, from the xen-devel list and adapted for Xen 3.1
@
text
@d1 1
a1 1
$NetBSD: patch-db,v 1.1 2009/01/24 18:57:59 bouyer Exp $
@


1.1.2.1
log
@file patch-dc was added on branch pkgsrc-2010Q3 on 2010-12-10 10:48:46 +0000
@
text
@d1 16
@


1.1.2.2
log
@Pullup ticket #3298 - requested by bouyer
sysutils/xenkernel3: security patch
sysutils/xenkernel33: security patch

Revisions pulled up:
- sysutils/xenkernel3/Makefile			1.19
- sysutils/xenkernel3/distinfo			1.12
- sysutils/xenkernel3/patches/patch-dc		1.1
- sysutils/xenkernel33/Makefile			1.12
- sysutils/xenkernel33/distinfo			1.10
- sysutils/xenkernel33/patches/patch-ab		1.1
---
Module Name:	pkgsrc
Committed By:	bouyer
Date:		Tue Dec  7 18:43:49 UTC 2010

Modified Files:
	pkgsrc/sysutils/xenkernel3: Makefile distinfo
Added Files:
	pkgsrc/sysutils/xenkernel3/patches: patch-dc

Log Message:
Add a fix for CVE-2010-4255, from the xen-devel list and adapted for Xen 3.1
---
Module Name:	pkgsrc
Committed By:	bouyer
Date:		Tue Dec  7 18:44:26 UTC 2010

Modified Files:
	pkgsrc/sysutils/xenkernel33: Makefile distinfo
Added Files:
	pkgsrc/sysutils/xenkernel33/patches: patch-ab

Log Message:
Add a fix for CVE-2010-4255, from the xen-devel list.
Bump PKGREVISION.
@
text
@a0 16
$NetBSD: patch-dc,v 1.1 2010/12/07 18:43:49 bouyer Exp $

Fix for CVE-2010-4255, from the xen-devel list and adapted for Xen 3.1

--- xen/arch/x86/traps.c.orig	2010-12-07 12:53:20.000000000 +0100
+++ xen/arch/x86/traps.c	2010-12-07 13:11:36.000000000 +0100
@@@@ -950,7 +950,8 @@@@
     {
         if ( paging_mode_external(d) && guest_mode(regs) )
             return paging_fault(addr, regs);
-        if ( (addr >= GDT_LDT_VIRT_START) && (addr < GDT_LDT_VIRT_END) )
+        if ( !(regs->error_code & PFEC_user_mode) &&
+	     (addr >= GDT_LDT_VIRT_START) && (addr < GDT_LDT_VIRT_END) )
             return handle_gdt_ldt_mapping_fault(
                 addr - GDT_LDT_VIRT_START, regs);
         return 0;
@