diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-04 20:24:47 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-04 20:24:47 +0100 |
| commit | c5a58f877ca645a3303f7a57476f2de837fdb97a (patch) | |
| tree | d2dccb46b1e676027ebeade1891f30313e7b2305 /drivers/net | |
| parent | Merge tag 'sound-5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/t... (diff) | |
| parent | xen: fix p2m size in dom0 for disabled memory hotplug case (diff) | |
| download | linux-c5a58f877ca645a3303f7a57476f2de837fdb97a.tar.xz linux-c5a58f877ca645a3303f7a57476f2de837fdb97a.zip | |
Merge tag 'for-linus-5.12b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip
Pull xen fixes from Juergen Gross:
"Two security issues (XSA-367 and XSA-369)"
* tag 'for-linus-5.12b-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
xen: fix p2m size in dom0 for disabled memory hotplug case
xen-netback: respect gnttab_map_refs()'s return value
Xen/gnttab: handle p2m update errors on a per-slot basis
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/xen-netback/netback.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index e5c73f819662..6afb5ca999c2 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c @@ -1343,11 +1343,21 @@ 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); + if (ret) { + unsigned int i; + + netdev_err(queue->vif->dev, "Map fail: nr %u ret %d\n", + nr_mops, ret); + for (i = 0; i < nr_mops; ++i) + WARN_ON_ONCE(queue->tx_map_ops[i].status == + GNTST_okay); + } + } work_done = xenvif_tx_submit(queue); |