Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c393f9a authored by Peng Tao's avatar Peng Tao Committed by Trond Myklebust
Browse files

nfs: fix pnfs direct write memory leak 



For pNFS direct writes, layout driver may dynamically allocate ds_cinfo.buckets.
So we need to take care to free them when freeing dreq.

Ideally this needs to be done inside layout driver where ds_cinfo.buckets
are allocated. But buckets are attached to dreq and reused across LD IO iterations.
So I feel it's OK to free them in the generic layer.

Cc: stable@vger.kernel.org [v3.4+]
Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
parent dca78001

fs/nfs/direct.c

+1 −0
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ static void nfs_direct_req_free(struct kref *kref) 
{

	struct nfs_direct_req *dreq = container_of(kref, struct nfs_direct_req, kref);



	nfs_free_pnfs_ds_cinfo(&dreq->ds_cinfo);

	if (dreq->l_ctx != NULL)

		nfs_put_lock_context(dreq->l_ctx);

	if (dreq->ctx != NULL)

include/linux/nfs_xdr.h

+11 −0
Original line number Diff line number Diff line
@@ -1224,11 +1224,22 @@ struct nfs41_free_stateid_res { 
	unsigned int			status;

};



static inline void

nfs_free_pnfs_ds_cinfo(struct pnfs_ds_commit_info *cinfo)

{

	kfree(cinfo->buckets);

}



#else



struct pnfs_ds_commit_info {

};



static inline void

nfs_free_pnfs_ds_cinfo(struct pnfs_ds_commit_info *cinfo)

{

}



#endif /* CONFIG_NFS_V4_1 */



#ifdef CONFIG_NFS_V4_2