nfs/flexfiles: fix leak of nfs4_ff_ds_version arrays

westonandrosadamson · amschuma-ntap · commit 1feb26162bee · 2017-08-08T17:18:10.000-04:00
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;
Cc: stable@vger.kernel.org # v4.0+
Signed-off-by: Anna Schumaker &lt;Anna.Schumaker@Netapp.com&gt;
diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c
@@ -32,6 +32,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
`@@ -32,6 +32,7 @@ void nfs4_ff_layout_free_deviceid(struct nfs4_ff_layout_ds *mirror_ds)`
`32`	`32`	`{`
`33`	`33`	`nfs4_print_deviceid(&mirror_ds->id_node.deviceid);`
`34`	`34`	`nfs4_pnfs_ds_put(mirror_ds->ds);`
	`35`	`+ kfree(mirror_ds->ds_versions);`
`35`	`36`	`kfree_rcu(mirror_ds, id_node.rcu);`
`36`	`37`	`}`
`37`	`38`