head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2016.09.21.17.03.38;	author bouyer;	state dead;
branches;
next	1.1;
commitid	DpaVr9YcAfk37bnz;

1.1
date	2016.08.06.10.10.10;	author spz;	state Exp;
branches;
next	;
commitid	FmgNNKHIxwRTjehz;


desc
@@


1.2
log
@Update xenkernel45 and xentools45 to 4.5.5.
Changes since 4.5.3: mostly bugfixes, including fixes for
security issues XSA-172, XSA-173, XSA-175, XSA-176, XSA-178, XSA-179, XSA-180,
XSA-181, XSA-182, XSA-183, XSA-184, XSA-185, XSA-186 and XSA-187.
All but XSA-175 were already fixed in pkgsrc.
Complete list of changes and links to the XSA advisories:
https://www.xenproject.org/downloads/xen-archives/xen-45-series/xen-455.html
@
text
@$NetBSD: patch-XSA-176,v 1.1 2016/08/06 10:10:10 spz Exp $

patch for XSA-176 from upstream

--- xen/arch/x86/mm/guest_walk.c.orig	2016-03-23 13:57:27.000000000 +0000
+++ xen/arch/x86/mm/guest_walk.c
@@@@ -231,9 +237,14 @@@@ guest_walk_tables(struct vcpu *v, struct
         rc |= _PAGE_PRESENT;
         goto out;
     }
+    if ( gflags & _PAGE_PSE )
+    {
+        rc |= _PAGE_PSE | _PAGE_INVALID_BIT;
+        goto out;
+    }
     rc |= ((gflags & mflags) ^ mflags);
     
-    pse1G = (gflags & _PAGE_PSE) && guest_supports_1G_superpages(v); 
+    pse1G = !!(gflags & _PAGE_PSE);
 
     if ( pse1G )
     {
@@@@ -253,6 +264,8 @@@@ guest_walk_tables(struct vcpu *v, struct
             /* _PAGE_PSE_PAT not set: remove _PAGE_PAT from flags. */
             flags &= ~_PAGE_PAT;
 
+        if ( !guest_supports_1G_superpages(v) )
+            rc |= _PAGE_PSE | _PAGE_INVALID_BIT;
         if ( gfn_x(start) & GUEST_L3_GFN_MASK & ~0x1 )
             rc |= _PAGE_INVALID_BITS;
 
@


1.1
log
@add patches for XSAs 176, 180 and 181 from upstream
@
text
@d1 1
a1 1
$NetBSD$
@