From: "J. Bruce Fields" <bfields@fieldses.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Olga Kornievskaia <olga.kornievskaia@gmail.com>,
Chuck Lever <chuck.lever@oracle.com>,
linux-nfs@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] nfsd: unlock on error in manage_cpntf_state()
Date: Thu, 05 Dec 2019 17:19:25 +0000 [thread overview]
Message-ID: <20191205171925.GD22402@fieldses.org> (raw)
In-Reply-To: <20191204075935.sgdcxib4jahd5blr@kili.mountain>
On Wed, Dec 04, 2019 at 10:59:36AM +0300, Dan Carpenter wrote:
> We are holding the "nn->s2s_cp_lock" so we can't return directly
> without unlocking first.
Thanks, applying.
--b.
>
> Fixes: f3dee17721a0 ("NFSD check stateids against copy stateids")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> fs/nfsd/nfs4state.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 296765e693d0..390ad454a229 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -5695,13 +5695,16 @@ __be32 manage_cpntf_state(struct nfsd_net *nn, stateid_t *st,
> if (cps_t) {
> state = container_of(cps_t, struct nfs4_cpntf_state,
> cp_stateid);
> - if (state->cp_stateid.sc_type != NFS4_COPYNOTIFY_STID)
> - return nfserr_bad_stateid;
> + if (state->cp_stateid.sc_type != NFS4_COPYNOTIFY_STID) {
> + state = NULL;
> + goto unlock;
> + }
> if (!clp)
> refcount_inc(&state->cp_stateid.sc_count);
> else
> _free_cpntf_state_locked(nn, state);
> }
> +unlock:
> spin_unlock(&nn->s2s_cp_lock);
> if (!state)
> return nfserr_bad_stateid;
> --
> 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: "J. Bruce Fields" <bfields@fieldses.org>
To: Dan Carpenter <dan.carpenter@oracle.com>
Cc: Olga Kornievskaia <olga.kornievskaia@gmail.com>,
Chuck Lever <chuck.lever@oracle.com>,
linux-nfs@vger.kernel.org, kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] nfsd: unlock on error in manage_cpntf_state()
Date: Thu, 5 Dec 2019 12:19:25 -0500 [thread overview]
Message-ID: <20191205171925.GD22402@fieldses.org> (raw)
In-Reply-To: <20191204075935.sgdcxib4jahd5blr@kili.mountain>
On Wed, Dec 04, 2019 at 10:59:36AM +0300, Dan Carpenter wrote:
> We are holding the "nn->s2s_cp_lock" so we can't return directly
> without unlocking first.
Thanks, applying.
--b.
>
> Fixes: f3dee17721a0 ("NFSD check stateids against copy stateids")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
> ---
> fs/nfsd/nfs4state.c | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 296765e693d0..390ad454a229 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -5695,13 +5695,16 @@ __be32 manage_cpntf_state(struct nfsd_net *nn, stateid_t *st,
> if (cps_t) {
> state = container_of(cps_t, struct nfs4_cpntf_state,
> cp_stateid);
> - if (state->cp_stateid.sc_type != NFS4_COPYNOTIFY_STID)
> - return nfserr_bad_stateid;
> + if (state->cp_stateid.sc_type != NFS4_COPYNOTIFY_STID) {
> + state = NULL;
> + goto unlock;
> + }
> if (!clp)
> refcount_inc(&state->cp_stateid.sc_count);
> else
> _free_cpntf_state_locked(nn, state);
> }
> +unlock:
> spin_unlock(&nn->s2s_cp_lock);
> if (!state)
> return nfserr_bad_stateid;
> --
> 2.11.0
next prev parent reply other threads:[~2019-12-05 17:19 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-04 7:59 [PATCH] nfsd: unlock on error in manage_cpntf_state() Dan Carpenter
2019-12-04 7:59 ` Dan Carpenter
2019-12-05 17:19 ` J. Bruce Fields [this message]
2019-12-05 17:19 ` J. Bruce Fields
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191205171925.GD22402@fieldses.org \
--to=bfields@fieldses.org \
--cc=chuck.lever@oracle.com \
--cc=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=olga.kornievskaia@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.