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

Commit a974deee authored by Trond Myklebust's avatar Trond Myklebust Committed by Anna Schumaker
Browse files

NFSv4: Fix memory and state leak in _nfs4_open_and_get_state 



If we exit because the file access check failed, we currently
leak the struct nfs4_state. We need to attach it to the
open context before returning.

Fixes: 3efb9722 ("NFSv4: Refactor _nfs4_open_and_get_state..")
Cc: stable@vger.kernel.org # 3.10+
Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parent 8ccc8691

fs/nfs/nfs4proc.c

+1 −1
Original line number Diff line number Diff line
@@ -2624,6 +2624,7 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, 
	ret = PTR_ERR(state);

	if (IS_ERR(state))

		goto out;

	ctx->state = state;

	if (server->caps & NFS_CAP_POSIX_LOCK)

		set_bit(NFS_STATE_POSIX_LOCKS, &state->flags);

	if (opendata->o_res.rflags & NFS4_OPEN_RESULT_MAY_NOTIFY_LOCK)
@@ -2649,7 +2650,6 @@ static int _nfs4_open_and_get_state(struct nfs4_opendata *opendata, 
	if (ret != 0)

		goto out;



	ctx->state = state;

	if (d_inode(dentry) == state->inode) {

		nfs_inode_attach_open_context(ctx);

		if (read_seqcount_retry(&sp->so_reclaim_seqcount, seq))