head	1.2;
access;
symbols
	pkgsrc-2016Q4:1.1.0.10
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.8
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.6
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.4
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4: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	2016.01.07.17.55.55;	author bouyer;	state Exp;
branches
	1.1.2.1;
next	;
commitid	nI5CmqYKUfq6I1Qy;

1.1.2.1
date	2016.01.07.17.55.55;	author bsiegert;	state dead;
branches;
next	1.1.2.2;
commitid	wxtXbEOcW341qyQy;

1.1.2.2
date	2016.01.11.20.26.12;	author bsiegert;	state Exp;
branches;
next	;
commitid	wxtXbEOcW341qyQy;


desc
@@


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

As discussed on pkgsrc-users.
@
text
@$NetBSD: patch-CVE-2015-8339,v 1.1 2016/01/07 17:55:55 bouyer Exp $

Patch for CVE-2015-8339 and CVE-2015-8340 aka XSA-159, based on
http://xenbits.xenproject.org/xsa/xsa159.patch

--- xen/common/memory.c.orig	2013-09-10 08:42:18.000000000 +0200
+++ xen/common/memory.c	2016-01-07 14:39:42.000000000 +0100
@@@@ -487,7 +487,11 @@@@
     /* Reassign any input pages we managed to steal. */
     while ( (page = page_list_remove_head(&in_chunk_list)) )
         if ( assign_pages(d, page, 0, MEMF_no_refcount) )
-            BUG();
+	{
+            BUG_ON(!d->is_dying);
+	    if ( test_and_clear_bit(_PGC_allocated, &page->count_info) )
+		put_page(page);
+	}
  dying:
     rcu_unlock_domain(d);
     /* Free any output pages we managed to allocate. */
@


1.1
log
@Apply patches from Xen repository, fixing:
CVE-2015-8339 and CVE-2015-8340 aka XSA-159
XSA-166
CVE-2015-8550 aka XSA-155
CVE-2015-8554 aka XSA-164
Bump pkgrevision
@
text
@d1 1
a1 1
$NetBSD: patch-CVE-2015-7971,v 1.1 2015/10/29 20:29:56 bouyer Exp $
@


1.1.2.1
log
@file patch-CVE-2015-8339 was added on branch pkgsrc-2015Q4 on 2016-01-11 20:26:12 +0000
@
text
@d1 20
@


1.1.2.2
log
@Pullup ticket #4887 - requested by bouyer
sysutils/xenkernel41: security fix
sysutils/xentools41: security fix

Revisions pulled up:
- sysutils/xenkernel41/Makefile                                 1.48
- sysutils/xenkernel41/distinfo                                 1.41
- sysutils/xenkernel41/patches/patch-CVE-2015-8339              1.1
- sysutils/xenkernel41/patches/patch-XSA-166                    1.1
- sysutils/xentools41/Makefile                                  1.59
- sysutils/xentools41/distinfo                                  1.41
- sysutils/xentools41/patches/patch-CVE-2015-8550               1.1
- sysutils/xentools41/patches/patch-CVE-2015-8554               1.1

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Thu Jan  7 17:55:55 UTC 2016

   Modified Files:
   	pkgsrc/sysutils/xenkernel41: Makefile distinfo
   	pkgsrc/sysutils/xentools41: Makefile distinfo
   Added Files:
   	pkgsrc/sysutils/xenkernel41/patches: patch-CVE-2015-8339 patch-XSA-166
   	pkgsrc/sysutils/xentools41/patches: patch-CVE-2015-8550
   	    patch-CVE-2015-8554

   Log Message:
   Apply patches from Xen repository, fixing:
   CVE-2015-8339 and CVE-2015-8340 aka XSA-159
   XSA-166
   CVE-2015-8550 aka XSA-155
   CVE-2015-8554 aka XSA-164
   Bump pkgrevision
@
text
@a0 20
$NetBSD$

Patch for CVE-2015-8339 and CVE-2015-8340 aka XSA-159, based on
http://xenbits.xenproject.org/xsa/xsa159.patch

--- xen/common/memory.c.orig	2013-09-10 08:42:18.000000000 +0200
+++ xen/common/memory.c	2016-01-07 14:39:42.000000000 +0100
@@@@ -487,7 +487,11 @@@@
     /* Reassign any input pages we managed to steal. */
     while ( (page = page_list_remove_head(&in_chunk_list)) )
         if ( assign_pages(d, page, 0, MEMF_no_refcount) )
-            BUG();
+	{
+            BUG_ON(!d->is_dying);
+	    if ( test_and_clear_bit(_PGC_allocated, &page->count_info) )
+		put_page(page);
+	}
  dying:
     rcu_unlock_domain(d);
     /* Free any output pages we managed to allocate. */
@