Commit d3175339 authored by Jan Beulich's avatar Jan Beulich Committed by Zheng Zengkai
Browse files

xen-netback: don't "handle" error by BUG() 



stable inclusion
from stable-5.10.18
commit 2814b3aa38a679c63aa535355b02a5bd0f681a83
bugzilla: 50148

--------------------------------

commit 3194a174 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: default avatarJan Beulich <jbeulich@suse.com>
Cc: stable@vger.kernel.org
Reviewed-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarJuergen Gross <jgross@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>

Signed-off-by: default avatarChen Jun <chenjun102@huawei.com>
Acked-by: default avatarXie XiuQi <xiexiuqi@huawei.com>
parent 47ff0eff

drivers/net/xen-netback/netback.c

+1 −3
Original line number Diff line number Diff line
@@ -1342,13 +1342,11 @@ int xenvif_tx_action(struct xenvif_queue *queue, int budget) 
		return 0;



	gnttab_batch_copy(queue->tx_copy_ops, nr_cops);

	if (nr_mops != 0) {

	if (nr_mops != 0)

		ret = gnttab_map_refs(queue->tx_map_ops,

				      NULL,

				      queue->pages_to_map,

				      nr_mops);

		BUG_ON(ret);

	}



	work_done = xenvif_tx_submit(queue);