From: Jeff Layton <jlayton@kernel.org>
To: Vasily Averin <vvs@virtuozzo.com>,
"J. Bruce Fields" <bfields@redhat.com>,
Chuck Lever <chuck.lever@oracle.com>
Cc: linux-nfs@vger.kernel.org
Subject: Re: [PATCH] nfsd: memory corruption in nfsd4_lock()
Date: Mon, 23 Mar 2020 08:18:59 -0400 [thread overview]
Message-ID: <7a3124cd2431eabe2495e0e8cd80068fe7261b1b.camel@kernel.org> (raw)
In-Reply-To: <db0980d0-8c99-940a-1748-04e679a366d1@virtuozzo.com>
On Mon, 2020-03-23 at 10:55 +0300, Vasily Averin wrote:
> New struct nfsd4_blocked_lock allocated in find_or_allocate_block()
> does not initialised nbl_list and nbl_lru.
> If conflock allocation fails rollback can call list_del_init()
> access uninitialized fields and corrupt memory.
>
> Fixes: 76d348fadff5 ("nfsd: have nfsd4_lock use blocking locks for v4.1+ lock")
> Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
> ---
> fs/nfsd/nfs4state.c | 32 +++++++++++++++-----------------
> 1 file changed, 15 insertions(+), 17 deletions(-)
>
> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
> index 369e574c5092..176ef8d24fae 100644
> --- a/fs/nfsd/nfs4state.c
> +++ b/fs/nfsd/nfs4state.c
> @@ -6524,6 +6524,13 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> goto out;
> }
>
> + conflock = locks_alloc_lock();
> + if (!conflock) {
> + dprintk("NFSD: %s: unable to allocate lock!\n", __func__);
> + status = nfserr_jukebox;
> + goto out;
> + }
> +
> nbl = find_or_allocate_block(lock_sop, &fp->fi_fhandle, nn);
> if (!nbl) {
> dprintk("NFSD: %s: unable to allocate block!\n", __func__);
> @@ -6542,13 +6549,6 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> file_lock->fl_end = last_byte_offset(lock->lk_offset, lock->lk_length);
> nfs4_transform_lock_offset(file_lock);
>
> - conflock = locks_alloc_lock();
> - if (!conflock) {
> - dprintk("NFSD: %s: unable to allocate lock!\n", __func__);
> - status = nfserr_jukebox;
> - goto out;
> - }
> -
> if (fl_flags & FL_SLEEP) {
> nbl->nbl_time = jiffies;
> spin_lock(&nn->blocked_locks_lock);
> @@ -6581,17 +6581,15 @@ nfsd4_lock(struct svc_rqst *rqstp, struct nfsd4_compound_state *cstate,
> status = nfserrno(err);
> break;
> }
> -out:
> - if (nbl) {
> - /* dequeue it if we queued it before */
> - if (fl_flags & FL_SLEEP) {
> - spin_lock(&nn->blocked_locks_lock);
> - list_del_init(&nbl->nbl_list);
> - list_del_init(&nbl->nbl_lru);
> - spin_unlock(&nn->blocked_locks_lock);
> - }
> - free_blocked_lock(nbl);
> + /* dequeue it if we queued it before */
> + if (fl_flags & FL_SLEEP) {
> + spin_lock(&nn->blocked_locks_lock);
> + list_del_init(&nbl->nbl_list);
> + list_del_init(&nbl->nbl_lru);
> + spin_unlock(&nn->blocked_locks_lock);
> }
> + free_blocked_lock(nbl);
> +out:
> if (nf)
> nfsd_file_put(nf);
> if (lock_stp) {
Good catch! Is there any reason not to just fix this by initializing the
list_heads in find_or_allocate_block? That seems like it'd be a simpler
fix.
--
Jeff Layton <jlayton@kernel.org>
next prev parent reply other threads:[~2020-03-23 12:19 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-03-23 7:55 [PATCH] nfsd: memory corruption in nfsd4_lock() Vasily Averin
2020-03-23 12:18 ` Jeff Layton [this message]
2020-03-23 22:12 ` Vasily Averin
2020-03-23 13:50 ` Chuck Lever
2020-03-23 15:09 ` J. Bruce Fields
2020-03-26 15:55 ` Chuck Lever
2020-03-27 4:50 ` [PATCH v2] " Vasily Averin
2020-03-30 10:22 ` Jeff Layton
2020-03-30 14:52 ` Chuck Lever
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=7a3124cd2431eabe2495e0e8cd80068fe7261b1b.camel@kernel.org \
--to=jlayton@kernel.org \
--cc=bfields@redhat.com \
--cc=chuck.lever@oracle.com \
--cc=linux-nfs@vger.kernel.org \
--cc=vvs@virtuozzo.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).