diff options
author | bouyer <bouyer@pkgsrc.org> | 2020-04-15 15:45:04 +0000 |
---|---|---|
committer | bouyer <bouyer@pkgsrc.org> | 2020-04-15 15:45:04 +0000 |
commit | f0b36e1b5d1dafe4f56a36513d84c18e61f889c4 (patch) | |
tree | 67b02e744d5103ccc4fbca8ec4e6e99fd38248a2 /sysutils | |
parent | a11ee168259181852ec5a002c69f1619f6180770 (diff) | |
download | pkgsrc-f0b36e1b5d1dafe4f56a36513d84c18e61f889c4.tar.gz |
Also apply patch for XSA316. ride previous PKGREVISION bump
Diffstat (limited to 'sysutils')
-rw-r--r-- | sysutils/xenkernel411/distinfo | 3 | ||||
-rw-r--r-- | sysutils/xenkernel411/patches/patch-XSA316 | 32 |
2 files changed, 34 insertions, 1 deletions
diff --git a/sysutils/xenkernel411/distinfo b/sysutils/xenkernel411/distinfo index aaa96e8c9ff..3e6b77eb141 100644 --- a/sysutils/xenkernel411/distinfo +++ b/sysutils/xenkernel411/distinfo @@ -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) = 78cf7306e9d1efcbf2ebf425025d46948ae83019 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 diff --git a/sysutils/xenkernel411/patches/patch-XSA316 b/sysutils/xenkernel411/patches/patch-XSA316 new file mode 100644 index 00000000000..33a632dd359 --- /dev/null +++ b/sysutils/xenkernel411/patches/patch-XSA316 @@ -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> +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> +Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com> +Reviewed-by: Julien Grall <jgrall@amazon.com> + +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 ) |