提交 d31d5c5b 编写于 作者: J Jan Beulich 提交者: Cheng Jian

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

stable inclusion
from linux-4.19.177
commit 717faa776ca2163119239ea58bb78c4d732d8a4f
CVE: CVE-2021-26931

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

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: NJan Beulich <jbeulich@suse.com>
Cc: stable@vger.kernel.org
Reviewed-by: NJuergen Gross <jgross@suse.com>
Signed-off-by: NJuergen Gross <jgross@suse.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Reviewed-by: NXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: NCheng Jian <cj.chengjian@huawei.com>
上级 0e912d2f
...@@ -1326,13 +1326,11 @@ int xenvif_tx_action(struct xenvif_queue *queue, int budget) ...@@ -1326,13 +1326,11 @@ int xenvif_tx_action(struct xenvif_queue *queue, int budget)
return 0; return 0;
gnttab_batch_copy(queue->tx_copy_ops, nr_cops); 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, ret = gnttab_map_refs(queue->tx_map_ops,
NULL, NULL,
queue->pages_to_map, queue->pages_to_map,
nr_mops); nr_mops);
BUG_ON(ret);
}
work_done = xenvif_tx_submit(queue); work_done = xenvif_tx_submit(queue);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册