diff options
| author | Jan Beulich <jbeulich@suse.com> | 2021-02-15 08:55:31 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-02-23 15:53:24 +0100 |
| commit | 2814b3aa38a679c63aa535355b02a5bd0f681a83 (patch) | |
| tree | 5597112f6b16ee1bfebc9816068f92ab26c6b6ad | |
| parent | 8f8ebd6b1cb5cff96a11cd336027e745d48c2cab (diff) | |
| download | kernel_replicant_linux-2814b3aa38a679c63aa535355b02a5bd0f681a83.tar.gz kernel_replicant_linux-2814b3aa38a679c63aa535355b02a5bd0f681a83.tar.bz2 kernel_replicant_linux-2814b3aa38a679c63aa535355b02a5bd0f681a83.zip | |
xen-netback: don't "handle" error by BUG()
commit 3194a1746e8aabe86075fd3c5e7cf1f4632d7f16 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>
| -rw-r--r-- | drivers/net/xen-netback/netback.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index bc3421d14576..423667b83751 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -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); |