Skip to content

Commit 0c72808

Browse files
GoodLuck612Trond Myklebust
authored andcommitted
pnfs/flexfiles: Fix memory leak in nfs4_ff_alloc_deviceid_node()
In nfs4_ff_alloc_deviceid_node(), if the allocation for ds_versions fails, the function jumps to the out_scratch label without freeing the already allocated dsaddrs list, leading to a memory leak. Fix this by jumping to the out_err_drain_dsaddrs label, which properly frees the dsaddrs list before cleaning up other resources. Fixes: d67ae82 ("pnfs/flexfiles: Add the FlexFile Layout Driver") Signed-off-by: Zilin Guan <zilin@seu.edu.cn> Signed-off-by: Trond Myklebust <trond.myklebust@hammerspace.com>
1 parent cce0be6 commit 0c72808

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

fs/nfs/flexfilelayout/flexfilelayoutdev.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ nfs4_ff_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev,
103103
sizeof(struct nfs4_ff_ds_version),
104104
gfp_flags);
105105
if (!ds_versions)
106-
goto out_scratch;
106+
goto out_err_drain_dsaddrs;
107107

108108
for (i = 0; i < version_count; i++) {
109109
/* 20 = version(4) + minor_version(4) + rsize(4) + wsize(4) +

0 commit comments

Comments
 (0)