head	1.2;
access;
symbols
	pkgsrc-2020Q3:1.1.0.4
	pkgsrc-2020Q3-base:1.1
	pkgsrc-2020Q2:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2020.11.06.21.45.49;	author bouyer;	state dead;
branches;
next	1.1;
commitid	WDPVMlrHGXeceSuC;

1.1
date	2020.07.16.09.56.47;	author bouyer;	state Exp;
branches
	1.1.2.1;
next	;
commitid	VUGYqLJSRgSsXhgC;

1.1.2.1
date	2020.07.16.09.56.47;	author bsiegert;	state dead;
branches;
next	1.1.2.2;
commitid	t4Man8octih3tQlC;

1.1.2.2
date	2020.08.28.15.37.42;	author bsiegert;	state Exp;
branches;
next	;
commitid	t4Man8octih3tQlC;


desc
@@


1.2
log
@Update xenkernel413 and xentools413 to 4.13.2. This includes fixes for
XSA up to XSA347, and an improved fix for XSA 286.
@
text
@$NetBSD: patch-XSA319,v 1.1 2020/07/16 09:56:47 bouyer Exp $

From: Jan Beulich <jbeulich@@suse.com>
Subject: x86/shadow: correct an inverted conditional in dirty VRAM tracking

This originally was "mfn_x(mfn) == INVALID_MFN". Make it like this
again, taking the opportunity to also drop the unnecessary nearby
braces.

This is XSA-319.

Fixes: 246a5a3377c2 ("xen: Use a typesafe to define INVALID_MFN")
Signed-off-by: Jan Beulich <jbeulich@@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@@citrix.com>

--- xen/arch/x86/mm/shadow/common.c.orig
+++ xen/arch/x86/mm/shadow/common.c
@@@@ -3252,10 +3252,8 @@@@ int shadow_track_dirty_vram(struct domai
             int dirty = 0;
             paddr_t sl1ma = dirty_vram->sl1ma[i];
 
-            if ( !mfn_eq(mfn, INVALID_MFN) )
-            {
+            if ( mfn_eq(mfn, INVALID_MFN) )
                 dirty = 1;
-            }
             else
             {
                 page = mfn_to_page(mfn);
@


1.1
log
@Add patches for Xen Security Advisories XSA317, XSA319, XSA320, XSA321
and XSA328.
Bump PKGREVISION
@
text
@d1 1
a1 1
$NetBSD: $
@


1.1.2.1
log
@file patch-XSA319 was added on branch pkgsrc-2020Q2 on 2020-08-28 15:37:42 +0000
@
text
@d1 29
@


1.1.2.2
log
@Pullup ticket #6307 - requested by bouyer
sysutils/xenkernel413: security fix

Revisions pulled up:
- sysutils/xenkernel413/Makefile                                1.2
- sysutils/xenkernel413/distinfo                                1.2
- sysutils/xenkernel413/patches/patch-XSA317                    1.1
- sysutils/xenkernel413/patches/patch-XSA319                    1.1
- sysutils/xenkernel413/patches/patch-XSA320                    1.1
- sysutils/xenkernel413/patches/patch-XSA321                    1.1
- sysutils/xenkernel413/patches/patch-XSA328                    1.1

---
   Module Name:	pkgsrc
   Committed By:	bouyer
   Date:		Thu Jul 16 09:56:47 UTC 2020

   Modified Files:
   	pkgsrc/sysutils/xenkernel413: Makefile distinfo
   Added Files:
   	pkgsrc/sysutils/xenkernel413/patches: patch-XSA317 patch-XSA319
   	    patch-XSA320 patch-XSA321 patch-XSA328

   Log Message:
   Add patches for Xen Security Advisories XSA317, XSA319, XSA320, XSA321
   and XSA328.
   Bump PKGREVISION
@
text
@a0 29
$NetBSD: patch-XSA319,v 1.1 2020/07/16 09:56:47 bouyer Exp $

From: Jan Beulich <jbeulich@@suse.com>
Subject: x86/shadow: correct an inverted conditional in dirty VRAM tracking

This originally was "mfn_x(mfn) == INVALID_MFN". Make it like this
again, taking the opportunity to also drop the unnecessary nearby
braces.

This is XSA-319.

Fixes: 246a5a3377c2 ("xen: Use a typesafe to define INVALID_MFN")
Signed-off-by: Jan Beulich <jbeulich@@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@@citrix.com>

--- xen/arch/x86/mm/shadow/common.c.orig
+++ xen/arch/x86/mm/shadow/common.c
@@@@ -3252,10 +3252,8 @@@@ int shadow_track_dirty_vram(struct domai
             int dirty = 0;
             paddr_t sl1ma = dirty_vram->sl1ma[i];
 
-            if ( !mfn_eq(mfn, INVALID_MFN) )
-            {
+            if ( mfn_eq(mfn, INVALID_MFN) )
                 dirty = 1;
-            }
             else
             {
                 page = mfn_to_page(mfn);
@