Skip to content

Commit 52e8f43

Browse files
jbeulichgregkh
authored andcommitted
xen-netback: don't "handle" error by BUG()
commit 3194a17 upstream. In particular -ENOMEM may come back here, from set_foreign_p2m_mapping(). Don't make problems worse, the more that handling elsewhere (together with map's status fields now indicating whether a mapping wasn't even attempted, and hence has to be considered failed) doesn't require this odd way of dealing with errors. This is part of XSA-362. Signed-off-by: Jan Beulich <jbeulich@suse.com> Cc: stable@vger.kernel.org Reviewed-by: Juergen Gross <jgross@suse.com> Signed-off-by: Juergen Gross <jgross@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 7109f61 commit 52e8f43

1 file changed

Lines changed: 1 addition & 3 deletions

File tree

drivers/net/xen-netback/netback.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1335,13 +1335,11 @@ int xenvif_tx_action(struct xenvif_queue *queue, int budget)
13351335
return 0;
13361336

13371337
gnttab_batch_copy(queue->tx_copy_ops, nr_cops);
1338-
if (nr_mops != 0) {
1338+
if (nr_mops != 0)
13391339
ret = gnttab_map_refs(queue->tx_map_ops,
13401340
NULL,
13411341
queue->pages_to_map,
13421342
nr_mops);
1343-
BUG_ON(ret);
1344-
}
13451343

13461344
work_done = xenvif_tx_submit(queue);
13471345

0 commit comments

Comments
 (0)