From f5211ce75821e0f2cc55effd28dfbe908226970f Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 15 Aug 2017 15:21:42 +0200 Subject: [PATCH] gnttab: correct pin status fixup for copy Regardless of copy operations only setting GNTPIN_hst*, GNTPIN_dev* also need to be taken into account when deciding whether to clear _GTF_{read,writ}ing. At least for consistency with code elsewhere the read part better doesn't use any mask at all. This is XSA-230. Signed-off-by: Jan Beulich Reviewed-by: Andrew Cooper master commit: 6e2a4c73564ab907b732059adb317d6ca2d138a2 master date: 2017-08-15 15:08:03 +0200 --- xen/common/grant_table.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 593121c440..ba5baf58f6 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -2122,10 +2122,10 @@ __release_grant_for_copy( static void __fixup_status_for_copy_pin(const struct active_grant_entry *act, uint16_t *status) { - if ( !(act->pin & GNTPIN_hstw_mask) ) + if ( !(act->pin & (GNTPIN_hstw_mask | GNTPIN_devw_mask)) ) gnttab_clear_flag(_GTF_writing, status); - if ( !(act->pin & GNTPIN_hstr_mask) ) + if ( !act->pin ) gnttab_clear_flag(_GTF_reading, status); } @@ -2333,7 +2333,7 @@ __acquire_grant_for_copy( unlock_out_clear: if ( !(readonly) && - !(act->pin & GNTPIN_hstw_mask) ) + !(act->pin & (GNTPIN_hstw_mask | GNTPIN_devw_mask)) ) gnttab_clear_flag(_GTF_writing, status); if ( !act->pin ) -- 2.39.5