2021-05-17 13:50:40

by Yongji Xie

Subject: [PATCH] 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.

Signed-off-by: Xie Yongji <[email protected]>
---
net/9p/trans_virtio.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net/9p/trans_virtio.c b/net/9p/trans_virtio.c
index 93f2f8654882..0960ed1ad7ac 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:
--
2.11.0

2021-05-17 17:13:29

by Dominique Martinet

Subject: Re: [PATCH] 9p/trans_virtio: Remove sysfs file on probe failure

Xie Yongji wrote on Mon, May 17, 2021 at 04:35:57PM +0800:
> This ensures we don't leak the sysfs file if we failed to
> allocate chan->vc_wq during probe.

Right.
I'll add a Fixed tag and take to -next shortly

--
Dominique

2021-05-17 17:23:25

by Yongji Xie

Subject: Re: Re: [PATCH] 9p/trans_virtio: Remove sysfs file on probe failure

On Mon, May 17, 2021 at 5:55 PM <[email protected]> wrote:
>
> Xie Yongji wrote on Mon, May 17, 2021 at 04:35:57PM +0800:
> > This ensures we don't leak the sysfs file if we failed to
> > allocate chan->vc_wq during probe.
>
> Right.
> I'll add a Fixed tag and take to -next shortly
>

Thanks!