diff mbox series

[5.10,22/29] xen-netback: dont "handle" error by BUG()

Message ID	20210222121024.443178239@linuxfoundation.org
State	Superseded
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Jan Beulich <jbeulich@suse.com>, Juergen Gross <jgross@suse.com> Subject: [PATCH 5.10 22/29] xen-netback: dont "handle" error by BUG() Date: Mon, 22 Feb 2021 13:13:16 +0100 Message-Id: <20210222121024.443178239@linuxfoundation.org> In-Reply-To: <20210222121019.444399883@linuxfoundation.org> References: <20210222121019.444399883@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.10,02/29] vdpa_sim: add struct vdpasim_dev_attr for device attributes [5.10,03/29] vdpa_sim: store parsed MAC address in a buffer [5.10,04/29] vdpa_sim: make config generic and usable for any device type [5.10,05/29] vdpa_sim: add get_config callback in vdpasim_dev_attr [5.10,06/29] IB/isert: add module param to set sg_tablesize for IO cmd [5.10,07/29] net: qrtr: Fix port ID for control messages [5.10,08/29] mptcp: skip to next candidate if subflow has unacked data [5.10,09/29] net/sched: fix miss init the mru in qdisc_skb_cb [5.10,10/29] mt76: mt7915: fix endian issues [5.10,11/29] mt76: mt7615: fix rdd mcu cmd endianness [5.10,12/29] net: sched: incorrect Kconfig dependencies on Netfilter modules [5.10,13/29] net: openvswitch: fix TTL decrement exception action execution [5.10,14/29] net: bridge: Fix a warning when del bridge sysfs [5.10,15/29] net: fix proc_fs init handling in af_packet and tls [5.10,16/29] Xen/x86: dont bail early from clear_foreign_p2m_mapping() [5.10,17/29] Xen/x86: also check kernel mapping in set_foreign_p2m_mapping() [5.10,18/29] Xen/gntdev: correct dev_bus_addr handling in gntdev_map_grant_pages() [5.10,19/29] Xen/gntdev: correct error checking in gntdev_map_grant_pages() [5.10,20/29] xen/arm: dont ignore return errors from set_phys_to_machine [5.10,21/29] xen-blkback: dont "handle" error by BUG() [5.10,22/29] xen-netback: dont "handle" error by BUG() [5.10,23/29] xen-scsiback: dont "handle" error by BUG() [5.10,24/29] xen-blkback: fix error handling in xen_blkbk_map() [5.10,25/29] tty: protect tty_write from odd low-level tty disciplines [5.10,26/29] Bluetooth: btusb: Always fallback to alt 1 for WBS [5.10,27/29] btrfs: fix backport of 2175bf57dc952 in 5.10.13 [5.10,28/29] btrfs: fix crash after non-aligned direct IO write with O_DSYNC [5.10,29/29] media: pwc: Use correct device for DMA

Commit Message

Greg KH Feb. 22, 2021, 12:13 p.m. UTC

From: Jan Beulich <jbeulich@suse.com>

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>

---
 drivers/net/xen-netback/netback.c |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff mbox series

Patch

--- 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
 		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);