Commit e9de2e5f authored by David Vrabel's avatar David Vrabel

xen/gntalloc: fix oops after runnning out of grant refs

Only set gref->gref_id if foreign access was successfully granted and
the grant ref is valid.

If gref->gref_id == -ENOSPC the test in __del_gref() would incorrectly
attempt to end foreign access (because grant_ref_t is unsigned).
Signed-off-by: default avatarDavid Vrabel <david.vrabel@citrix.com>
Reported-by: default avatarDave Scott <dave.scott@citrix.com>
Reviewed-by: default avatarBoris Ostrovsky <boris.ostrovsky@oracle.com>
parent 3dcf6367
...@@ -141,13 +141,11 @@ static int add_grefs(struct ioctl_gntalloc_alloc_gref *op, ...@@ -141,13 +141,11 @@ static int add_grefs(struct ioctl_gntalloc_alloc_gref *op,
goto undo; goto undo;
/* Grant foreign access to the page. */ /* Grant foreign access to the page. */
gref->gref_id = gnttab_grant_foreign_access(op->domid, rc = gnttab_grant_foreign_access(op->domid,
pfn_to_mfn(page_to_pfn(gref->page)), readonly); pfn_to_mfn(page_to_pfn(gref->page)), readonly);
if ((int)gref->gref_id < 0) { if (rc < 0)
rc = gref->gref_id;
goto undo; goto undo;
} gref_ids[i] = gref->gref_id = rc;
gref_ids[i] = gref->gref_id;
} }
/* Add to gref lists. */ /* Add to gref lists. */
...@@ -193,7 +191,7 @@ static void __del_gref(struct gntalloc_gref *gref) ...@@ -193,7 +191,7 @@ static void __del_gref(struct gntalloc_gref *gref)
gref->notify.flags = 0; gref->notify.flags = 0;
if (gref->gref_id > 0) { if (gref->gref_id) {
if (gnttab_query_foreign_access(gref->gref_id)) if (gnttab_query_foreign_access(gref->gref_id))
return; return;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment