xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

virtio_ring: check desc == NULL when using indirect with packed

Browse Source 
[ Upstream commit fc6d70f40b3d0b3219e2026d05be0409695f620d ]

When using indirect with packed, we don't check for allocation failures.
This patch checks that and fall back on direct.

Fixes: 1ce9e6055f ("virtio_ring: introduce packed ring support")
Signed-off-by: Xuan Zhuo <xuanzhuo@linux.alibaba.com>
Link: https://lore.kernel.org/r/20211020112323.67466-3-xuanzhuo@linux.alibaba.com
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Xuan Zhuo
2021-10-20 19:23:23 +08:00
committed by Greg Kroah-Hartman
parent 80e6643393
commit c8447cb14a
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/virtio/virtio_ring.c
View File

@@ -992,6 +992,8 @@ static int virtqueue_add_indirect_packed(struct vring_virtqueue *vq,
head = vq->packed.next_avail_idx; head = vq->packed.next_avail_idx;
desc = alloc_indirect_packed(total_sg, gfp); desc = alloc_indirect_packed(total_sg, gfp);
if (!desc)
return -ENOMEM;
if (unlikely(vq->vq.num_free < 1)) { if (unlikely(vq->vq.num_free < 1)) {
pr_debug("Can't add buf len 1 - avail = 0\n"); pr_debug("Can't add buf len 1 - avail = 0\n");
@@ -1103,6 +1105,7 @@ static inline int virtqueue_add_packed(struct virtqueue *_vq,
unsigned int i, n, c, descs_used, err_idx; unsigned int i, n, c, descs_used, err_idx;
__le16 head_flags, flags; __le16 head_flags, flags;
u16 head, id, prev, curr, avail_used_flags; u16 head, id, prev, curr, avail_used_flags;
int err;
START_USE(vq); START_USE(vq);
@@ -1118,9 +1121,14 @@ static inline int virtqueue_add_packed(struct virtqueue *_vq,
BUG_ON(total_sg == 0); BUG_ON(total_sg == 0);
if (virtqueue_use_indirect(_vq, total_sg)) if (virtqueue_use_indirect(_vq, total_sg)) {
return virtqueue_add_indirect_packed(vq, sgs, total_sg, err = virtqueue_add_indirect_packed(vq, sgs, total_sg, out_sgs,
out_sgs, in_sgs, data, gfp); in_sgs, data, gfp);
if (err != -ENOMEM)
return err;
/* fall back on direct */
}
head = vq->packed.next_avail_idx; head = vq->packed.next_avail_idx;
avail_used_flags = vq->packed.avail_used_flags; avail_used_flags = vq->packed.avail_used_flags;