CVS commit: pkgsrc/sysutils/xenkernel411

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Wed Apr 15 15:45:05 UTC 2020

Modified Files:
        pkgsrc/sysutils/xenkernel411: distinfo
Added Files:
        pkgsrc/sysutils/xenkernel411/patches: patch-XSA316

Log Message:
Also apply patch for XSA316. ride previous PKGREVISION bump


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/sysutils/xenkernel411/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/sysutils/xenkernel411/patches/patch-XSA316

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/xenkernel411/distinfo
diff -u pkgsrc/sysutils/xenkernel411/distinfo:1.10 pkgsrc/sysutils/xenkernel411/distinfo:1.11
--- pkgsrc/sysutils/xenkernel411/distinfo:1.10  Wed Apr 15 15:37:19 2020
+++ pkgsrc/sysutils/xenkernel411/distinfo       Wed Apr 15 15:45:04 2020
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2020/04/15 15:37:19 bouyer Exp $
+$NetBSD: distinfo,v 1.11 2020/04/15 15:45:04 bouyer Exp $
 
 SHA1 (xen411/xen-4.11.3.tar.gz) = 2d77152168d6f9dcea50db9cb8e3e6a0720a4a1b
 RMD160 (xen411/xen-4.11.3.tar.gz) = cfb2e699842867b60d25a01963c564a6c5e580da
@@ -11,6 +11,7 @@ SHA1 (patch-XSA309) = 78cf7306e9d1efcbf2
 SHA1 (patch-XSA310) = 77b711f4b75de1d473a6988eb6f2b48e37cc353a
 SHA1 (patch-XSA311) = 4d3e6cc39c2b95cb3339961271df2bc885667927
 SHA1 (patch-XSA313) = b2f281d6aed1207727cd454dcb5e914c7f6fb44b
+SHA1 (patch-XSA316) = 9cce683315e4c1ca6d53b578e69ae71e1db2b3eb
 SHA1 (patch-XSA318) = d0dcbb99ab584098aed7995a7a05d5bf4ac28d47
 SHA1 (patch-xen_Makefile) = 465388d80de414ca3bb84faefa0f52d817e423a6
 SHA1 (patch-xen_Rules.mk) = c743dc63f51fc280d529a7d9e08650292c171dac

Added files:

Index: pkgsrc/sysutils/xenkernel411/patches/patch-XSA316
diff -u /dev/null pkgsrc/sysutils/xenkernel411/patches/patch-XSA316:1.1
--- /dev/null   Wed Apr 15 15:45:05 2020
+++ pkgsrc/sysutils/xenkernel411/patches/patch-XSA316   Wed Apr 15 15:45:04 2020
@@ -0,0 +1,32 @@
+$NetBSD: patch-XSA316,v 1.1 2020/04/15 15:45:04 bouyer Exp $
+
+From: Ross Lagerwall <ross.lagerwall%citrix.com@localhost>
+Subject: xen/gnttab: Fix error path in map_grant_ref()
+
+Part of XSA-295 (c/s 863e74eb2cffb) inadvertently re-positioned the brackets,
+changing the logic.  If the _set_status() call fails, the grant_map hypercall
+would fail with a status of 1 (rc != GNTST_okay) instead of the expected
+negative GNTST_* error.
+
+This error path can be taken due to bad guest state, and causes net/blk-back
+in Linux to crash.
+
+This is XSA-316.
+
+Signed-off-by: Ross Lagerwall <ross.lagerwall%citrix.com@localhost>
+Reviewed-by: Andrew Cooper <andrew.cooper3%citrix.com@localhost>
+Reviewed-by: Julien Grall <jgrall%amazon.com@localhost>
+
+diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
+index 9fd6e60416..4b5344dc21 100644
+--- xen/common/grant_table.c.orig
++++ xen/common/grant_table.c
+@@ -1031,7 +1031,7 @@ map_grant_ref(
+     {
+         if ( (rc = _set_status(shah, status, rd, rgt->gt_version, act,
+                                op->flags & GNTMAP_readonly, 1,
+-                               ld->domain_id) != GNTST_okay) )
++                               ld->domain_id)) != GNTST_okay )
+             goto act_release_out;
+ 
+         if ( !act->pin )