pnfs/blocklayout: Fix memory leak in bl_parse_scsi()

[ Upstream commit 5a74af51c3a6f4cd22c128b0c1c019f68fa90011 ]

In bl_parse_scsi(), if the block device length is zero, the function
returns immediately without releasing the file reference obtained via
bl_open_path(), leading to a memory leak.

Fix this by jumping to the out_blkdev_put label to ensure the file
reference is properly released.

Fixes: d76c769c8db4c ("pnfs/blocklayout: Don't add zero-length pnfs_block_dev")
Signed-off-by: Zilin Guan <zilin@seu.edu.cn>
Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/fs/nfs/blocklayout/dev.c b/fs/nfs/blocklayout/dev.c
index 44306ac22353bed51d521cb0b5308cf12b5c3bd5..22d4529c61933bee1522d8ce089abf1a0e94b24e 100644 (file)
--- a/fs/nfs/blocklayout/dev.c
+++ b/fs/nfs/blocklayout/dev.c
@@ -417,8 +417,10 @@ bl_parse_scsi(struct nfs_server *server, struct pnfs_block_dev *d,
        d->map = bl_map_simple;
        d->pr_key = v->scsi.pr_key;
 
-       if (d->len == 0)
-               return -ENODEV;
+       if (d->len == 0) {
+               error = -ENODEV;
+               goto out_blkdev_put;
+       }
 
        ops = bdev->bd_disk->fops->pr_ops;
        if (!ops) {