nfs/flexfiles: fix leak of nfs4_ff_ds_version arrays

westonandrosadamson · gregkh · commit a89843a80bd4 · 2017-08-16T13:40:28.000-07:00
commit 1feb26162bee7b2f110facfec71b5c7bdbc7d14d upstream.

The client was freeing the nfs4_ff_layout_ds, but not the contained
nfs4_ff_ds_version array.

Signed-off-by: Weston Andros Adamson &lt;dros@primarydata.com&gt;
Signed-off-by: Anna Schumaker &lt;Anna.Schumaker@Netapp.com&gt;
Signed-off-by: Greg Kroah-Hartman &lt;gregkh@linuxfoundation.org&gt;
diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c
@@ -30,6 +30,7 @@ void nfs4_ff_layout_free_deviceid(struct nfs4_ff_layout_ds *mirror_ds)
 {
 	nfs4_print_deviceid(&mirror_ds->id_node.deviceid);
 	nfs4_pnfs_ds_put(mirror_ds->ds);
+	kfree(mirror_ds->ds_versions);
 	kfree_rcu(mirror_ds, id_node.rcu);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ void nfs4_ff_layout_free_deviceid(struct nfs4_ff_layout_ds *mirror_ds)`
`30`	`30`	`{`
`31`	`31`	`nfs4_print_deviceid(&mirror_ds->id_node.deviceid);`
`32`	`32`	`nfs4_pnfs_ds_put(mirror_ds->ds);`
	`33`	`+ kfree(mirror_ds->ds_versions);`
`33`	`34`	`kfree_rcu(mirror_ds, id_node.rcu);`
`34`	`35`	`}`
`35`	`36`