From: Xie Yongji <xieyongji@bytedance.com>
Date: Mon, 17 May 2021 08:35:57 +0000 (+0800)
Subject: 9p/trans_virtio: Remove sysfs file on probe failure
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=cba7dcd8878e04647c47c829846bbde91e67ca2f;p=users%2Fjedix%2Flinux-maple.git

9p/trans_virtio: Remove sysfs file on probe failure

This ensures we don't leak the sysfs file if we failed to
allocate chan->vc_wq during probe.

Link: http://lkml.kernel.org/r/20210517083557.172-1-xieyongji@bytedance.com
Fixes: 86c8437383ac ("net/9p: Add sysfs mount_tag file for virtio 9P device")
Signed-off-by: Xie Yongji <xieyongji@bytedance.com>
Signed-off-by: Dominique Martinet <asmadeus@codewreck.org>
---

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 93f2f86548826..7bcaa46165fe9 100644
--- a/net/9p/trans_virtio.c
+++ b/net/9p/trans_virtio.c
@@ -610,7 +610,7 @@ static int p9_virtio_probe(struct virtio_device *vdev)
 	chan->vc_wq = kmalloc(sizeof(wait_queue_head_t), GFP_KERNEL);
 	if (!chan->vc_wq) {
 		err = -ENOMEM;
-		goto out_free_tag;
+		goto out_remove_file;
 	}
 	init_waitqueue_head(chan->vc_wq);
 	chan->ring_bufs_avail = 1;
@@ -628,6 +628,8 @@ static int p9_virtio_probe(struct virtio_device *vdev)
 
 	return 0;
 
+out_remove_file:
+	sysfs_remove_file(&vdev->dev.kobj, &dev_attr_mount_tag.attr);
 out_free_tag:
 	kfree(tag);
 out_free_vq: