AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

xen-blkback: fix error handling in xen_blkbk_map()

Browse Source 
commit 871997bc9e423f05c7da7c9178e62dde5df2a7f8 upstream.

The function uses a goto-based loop, which may lead to an earlier error
getting discarded by a later iteration. Exit this ad-hoc loop when an
error was encountered.

The out-of-memory error path additionally fails to fill a structure
field looked at by xen_blkbk_unmap_prepare() before inspecting the
handle which does get properly set (to BLKBACK_INVALID_HANDLE).

Since the earlier exiting from the ad-hoc loop requires the same field
filling (invalidation) as that on the out-of-memory path, fold both
paths. While doing so, drop the pr_alert(), as extra log messages aren't
going to help the situation (the kernel will log oom conditions already
anyway).

This is XSA-365.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Juergen Gross <jgross@suse.com>
Reviewed-by: Julien Grall <julien@xen.org>
Signed-off-by: Juergen Gross <jgross@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jan Beulich 2021-02-15 08:56:44 +01:00 committed by Greg Kroah-Hartman
parent 9bea436fc3
commit 00805af45a
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
drivers/block/xen-blkback/blkback.c
View File

@ -794,8 +794,13 @@ static int xen_blkbk_map(struct xen_blkif_ring *ring,
pages[i]->persistent_gnt = persistent_gnt; pages[i]->persistent_gnt = persistent_gnt;
} else { } else {
if (gnttab_page_cache_get(&ring->free_pages, if (gnttab_page_cache_get(&ring->free_pages,
&pages[i]->page)) &pages[i]->page)) {
goto out_of_memory; gnttab_page_cache_put(&ring->free_pages,
pages_to_gnt,
segs_to_map);
ret = -ENOMEM;
goto out;
}
addr = vaddr(pages[i]->page); addr = vaddr(pages[i]->page);
pages_to_gnt[segs_to_map] = pages[i]->page; pages_to_gnt[segs_to_map] = pages[i]->page;
pages[i]->persistent_gnt = NULL; pages[i]->persistent_gnt = NULL;
@ -880,17 +885,18 @@ static int xen_blkbk_map(struct xen_blkif_ring *ring,
} }
segs_to_map = 0; segs_to_map = 0;
last_map = map_until; last_map = map_until;
if (map_until != num) if (!ret && map_until != num)
goto again; goto again;
return ret; out:
for (i = last_map; i < num; i++) {
out_of_memory: /* Don't zap current batch's valid persistent grants. */
pr_alert("%s: out of memory\n", __func__); if(i >= last_map + segs_to_map)
gnttab_page_cache_put(&ring->free_pages, pages_to_gnt, segs_to_map); pages[i]->persistent_gnt = NULL;
for (i = last_map; i < num; i++)
pages[i]->handle = BLKBACK_INVALID_HANDLE; pages[i]->handle = BLKBACK_INVALID_HANDLE;
return -ENOMEM; }
return ret;
} }
static int xen_blkbk_map_seg(struct pending_req *pending_req) static int xen_blkbk_map_seg(struct pending_req *pending_req)