Skip to contentSkip to conversation

Patch "virtio_ring: fix num_free handling in error case" has been added to the 4.14-stable tree

PATCH [email protected] 1 participant 1 message Mar 12, 2018

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

virtio_ring: fix num_free handling in error case

to the 4.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
virtio_ring-fix-num_free-handling-in-error-case.patch
and it can be found in the queue-4.14 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From e82df670235138575b37ff0ec24412a471efd97f Mon Sep 17 00:00:00 2001

From: Tiwei Bie <[email protected]>
Date: Fri, 23 Feb 2018 19:41:30 +0800
Subject: virtio_ring: fix num_free handling in error case

From: Tiwei Bie <[email protected]>

commit e82df670235138575b37ff0ec24412a471efd97f upstream.

The vq->vq.num_free hasn't been changed when error happens, so it shouldn't be changed when handling the error.

Fixes 780bc7903a32 ("virtio_ring: Support DMA APIs")
Cc Andy Lutomirski <[email protected]>
Cc Michael S. Tsirkin <[email protected]>
---
 drivers/virtio/virtio_ring.c |    2 --
 1 file changed, 2 deletions(-)
drivers/virtio/virtio_ring.c +0 -2
@@ -428,8 +428,6 @@ unmap_release:
 		i = virtio16_to_cpu(_vq->vdev, vq->vring.desc[i].next);
 	}
 
-	vq->vq.num_free += total_sg;
-
 	if (indirect)
 		kfree(desc);
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.14/virtio_ring-fix-num_free-handling-in-error-case.patch