diff options
| author |   Jan Beulich <jbeulich@suse.com> | 2021-09-17 08:13:08 +0200 |
|---|---|---|
| committer |   Juergen Gross <jgross@suse.com> | 2021-09-20 16:57:08 +0200 |
| commit | f28347cc66395e96712f5c2db0a302ee75bafce6 (patch) | |
| tree | 4f5e9201e40ca5872e60d0bcfd92c5e6b3e74182 /drivers/xen | |
| parent | xen/x86: drop redundant zeroing from cpu_initialize_context() (diff) | |
| download | linux-dev-f28347cc66395e96712f5c2db0a302ee75bafce6.tar.xz linux-dev-f28347cc66395e96712f5c2db0a302ee75bafce6.zip | |
Xen/gntdev: don't ignore kernel unmapping error
While working on XSA-361 and its follow-ups, I failed to spot another
place where the kernel mapping part of an operation was not treated the
same as the user space part. Detect and propagate errors and add a 2nd
pr_debug().
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Link: https://lore.kernel.org/r/c2513395-74dc-aea3-9192-fd265aa44e35@suse.com
Signed-off-by: Juergen Gross <jgross@suse.com>
Diffstat (limited to 'drivers/xen')
| -rw-r--r-- | drivers/xen/gntdev.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/xen/gntdev.c b/drivers/xen/gntdev.c index 1e7f6b1c0c97..fec1b6537166 100644 --- a/drivers/xen/gntdev.c +++ b/drivers/xen/gntdev.c @@ -381,6 +381,14 @@ static int __unmap_grant_pages(struct gntdev_grant_map *map, int offset, map->unmap_ops[offset+i].handle, map->unmap_ops[offset+i].status); map->unmap_ops[offset+i].handle = INVALID_GRANT_HANDLE; + if (use_ptemod) { + if (map->kunmap_ops[offset+i].status) + err = -EINVAL; + pr_debug("kunmap handle=%u st=%d\n", + map->kunmap_ops[offset+i].handle, + map->kunmap_ops[offset+i].status); + map->kunmap_ops[offset+i].handle = INVALID_GRANT_HANDLE; + } } return err; } |