| From 103227d0f2518eafb9074613e4964583b11669bf Mon Sep 17 00:00:00 2001 |
| From: Trond Myklebust <trond.myklebust@primarydata.com> |
| Date: Wed, 8 Feb 2017 11:29:46 -0500 |
| Subject: [PATCH] NFSv4: Fix memory and state leak in _nfs4_open_and_get_state |
| |
| commit a974deee477af89411e0f80456bfb344ac433c98 upstream. |
| |
| 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: 3efb9722475e ("NFSv4: Refactor _nfs4_open_and_get_state..") |
| Cc: stable@vger.kernel.org # 3.10+ |
| Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com> |
| Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c |
| index 7cd632d072db..563a5af80a92 100644 |
| --- a/fs/nfs/nfs4proc.c |
| +++ b/fs/nfs/nfs4proc.c |
| @@ -2536,6 +2536,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); |
| |
| @@ -2559,7 +2560,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)) |
| -- |
| 2.12.0 |
| |
