From: Jan Beulich <jbeulich@suse.com>
Date: Thu, 11 Jun 2015 12:44:12 +0000 (+0200)
Subject: gnttab: add missing version check to GNTTABOP_swap_grant_ref handling
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=5d5c09d853d3f212861f70c577c65d1703f752ae;p=people%2Fliuw%2Flibxenctrl-split%2Fxen.git

gnttab: add missing version check to GNTTABOP_swap_grant_ref handling

... avoiding NULL derefs when the version to use wasn't set yet (via
GNTTABOP_setup_table or GNTTABOP_set_version).

This is CVE-2015-4163 / XSA-134.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index dfb45f8d66..ca4c973378 100644
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -2592,6 +2592,9 @@ __gnttab_swap_grant_ref(grant_ref_t ref_a, grant_ref_t ref_b)
 
     spin_lock(&gt->lock);
 
+    if ( gt->gt_version == 0 )
+        PIN_FAIL(out, GNTST_general_error, "grant table not yet set up\n");
+
     /* Bounds check on the grant refs */
     if ( unlikely(ref_a >= nr_grant_entries(d->grant_table)))
         PIN_FAIL(out, GNTST_bad_gntref, "Bad ref-a (%d).\n", ref_a);