[PATCH 3/4] vhost-net: Free ubuf when vhost_dev_ioctl fails

Asias He
Fri, 03 May 2013 06:25:17 -0000

Free ubuf when vhost_dev_ioctl for VHOST_SET_OWNER fails.

Signed-off-by: Asias He <asias at redhat.com>
---
 drivers/vhost/net.c | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/drivers/vhost/net.c b/drivers/vhost/net.c
index b2f6b41..eb73217 100644
--- a/drivers/vhost/net.c
+++ b/drivers/vhost/net.c
@@ -152,6 +152,19 @@ void vhost_ubuf_put_and_wait(struct vhost_ubuf_ref *ubufs)
 	kfree(ubufs);
 }

+static void vhost_net_clear_ubuf_info(struct vhost_net *n)
+{
+
+	bool zcopy;
+	int i;
+
+	for (i = 0; i < n->dev.nvqs; ++i) {
+		zcopy = vhost_zcopy_mask & (0x1 << i);
+		if (zcopy)
+			kfree(n->vqs[i].ubuf_info);
+	}
+}
+
 int vhost_net_set_ubuf_info(struct vhost_net *n)
 {
 	bool zcopy;
@@ -1069,10 +1082,13 @@ static long vhost_net_ioctl(struct file *f, unsigned int
ioctl,
 				goto out;
 		}
 		r = vhost_dev_ioctl(&n->dev, ioctl, argp);
-		if (r == -ENOIOCTLCMD)
+		if (r == -ENOIOCTLCMD) {
 			r = vhost_vring_ioctl(&n->dev, ioctl, argp);
-		else
+		} else {
+			if (r < 0 && ioctl == VHOST_SET_OWNER)
+				vhost_net_clear_ubuf_info(n);
 			vhost_net_flush(n);
+		}
 out:
 		mutex_unlock(&n->dev.mutex);
 		return r;
--
1.8.1.4