head	1.2;
access;
symbols
	pkgsrc-2016Q4:1.1.0.38
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.36
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.34
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.32
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.30
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.28
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.26
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.24
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.22
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.20
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.18
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.16
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.14
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.12
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.10
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.8
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.6
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.4
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2: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	2012.07.28.12.02.16;	author drochner;	state Exp;
branches
	1.1.2.1;
next	;

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

1.1.2.2
date	2012.07.31.18.29.36;	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-CVE-2012-3432,v 1.1 2012/07/28 12:02:16 drochner Exp $

see http://lists.xen.org/archives/html/xen-devel/2012-07/msg01649.html

--- xen/arch/x86/hvm/io.c.orig	2009-08-06 12:56:41.000000000 +0000
+++ xen/arch/x86/hvm/io.c
@@@@ -181,6 +181,8 @@@@ int handle_mmio(void)
 
     rc = hvm_emulate_one(&ctxt);
 
+    if ( rc != X86EMUL_RETRY )
+        curr->arch.hvm_vcpu.io_state = HVMIO_none;
     if ( curr->arch.hvm_vcpu.io_state == HVMIO_awaiting_completion )
         curr->arch.hvm_vcpu.io_state = HVMIO_handle_mmio_awaiting_completion;
     else
@


1.1
log
@copy security patch from xenkernel41 - it also applies to 3.3
(noticed by Daniel Horecki)
bump PKGREV
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-CVE-2012-3432 was added on branch pkgsrc-2012Q2 on 2012-07-31 18:29:36 +0000
@
text
@d1 15
@


1.1.2.2
log
@Pullup ticket #3885 - requested by drochner
sysutils/xenkernel33: security patch
sysutils/xenkernel41: security patch

Revisions pulled up:
- sysutils/xenkernel33/Makefile                                 1.18
- sysutils/xenkernel33/distinfo                                 1.16
- sysutils/xenkernel33/patches/patch-CVE-2012-3432              1.1
- sysutils/xenkernel41/Makefile                                 1.8
- sysutils/xenkernel41/distinfo                                 1.8
- sysutils/xenkernel41/patches/patch-CVE-2012-3432              1.1

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Fri Jul 27 18:50:34 UTC 2012

   Modified Files:
           pkgsrc/sysutils/xenkernel41: Makefile distinfo
   Added Files:
           pkgsrc/sysutils/xenkernel41/patches: patch-CVE-2012-3432

   Log Message:
   add patch from upstream to fix bug in MMIO emulation which can cause
   guest crashes by unprivileged users, only for HVM guests, and if
   MMIO is granted to the user process (CVE-2012-3432)
   bump PKGREV

---
   Module Name:    pkgsrc
   Committed By:   drochner
   Date:           Sat Jul 28 12:02:16 UTC 2012

   Modified Files:
           pkgsrc/sysutils/xenkernel33: Makefile distinfo
   Added Files:
           pkgsrc/sysutils/xenkernel33/patches: patch-CVE-2012-3432

   Log Message:
   copy security patch from xenkernel41 - it also applies to 3.3
   (noticed by Daniel Horecki)
   bump PKGREV
@
text
@a0 15
$NetBSD$

see http://lists.xen.org/archives/html/xen-devel/2012-07/msg01649.html

--- xen/arch/x86/hvm/io.c.orig	2009-08-06 12:56:41.000000000 +0000
+++ xen/arch/x86/hvm/io.c
@@@@ -181,6 +181,8 @@@@ int handle_mmio(void)
 
     rc = hvm_emulate_one(&ctxt);
 
+    if ( rc != X86EMUL_RETRY )
+        curr->arch.hvm_vcpu.io_state = HVMIO_none;
     if ( curr->arch.hvm_vcpu.io_state == HVMIO_awaiting_completion )
         curr->arch.hvm_vcpu.io_state = HVMIO_handle_mmio_awaiting_completion;
     else
@