From: Chuck Lever <chuck.lever@oracle.com>
To: Vasily Averin <vvs@virtuozzo.com>
Cc: Jeff Layton <jlayton@kernel.org>,
Bruce Fields <bfields@redhat.com>,
Linux NFS Mailing List <linux-nfs@vger.kernel.org>
Subject: Re: [PATCH v2] nfsd: memory corruption in nfsd4_lock()
Date: Mon, 30 Mar 2020 10:52:40 -0400 [thread overview]
Message-ID: <6BDFAB55-80A2-45D0-BC3B-CFB626AD2017@oracle.com> (raw)
In-Reply-To: <80e1506f0a997f1f925990fe12c4469947b7b184.camel@kernel.org>
> On Mar 30, 2020, at 6:22 AM, Jeff Layton <jlayton@kernel.org> wrote:
>
> On Fri, 2020-03-27 at 07:50 +0300, Vasily Averin wrote:
>> Dear Chuck,
>> please use following patch instead.
Somehow this did not make it to my inbox on Friday, but Jeff's
Reviewed-by did show up today. I'll apply this one, thanks!
>> -----
>> New struct nfsd4_blocked_lock allocated in find_or_allocate_block()
>> does not initialized nbl_list and nbl_lru.
>> If conflock allocation fails rollback can call list_del_init()
>> access uninitialized fields and corrupt memory.
>>
>> v2: just initialize nbl_list and nbl_lru right after nbl allocation.
>>
>> 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 | 2 ++
>> 1 file changed, 2 insertions(+)
>>
>> diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c
>> index 369e574c5092..1b2eb6b35d64 100644
>> --- a/fs/nfsd/nfs4state.c
>> +++ b/fs/nfsd/nfs4state.c
>> @@ -266,6 +266,8 @@ find_or_allocate_block(struct nfs4_lockowner *lo, struct knfsd_fh *fh,
>> if (!nbl) {
>> nbl= kmalloc(sizeof(*nbl), GFP_KERNEL);
>> if (nbl) {
>> + INIT_LIST_HEAD(&nbl->nbl_list);
>> + INIT_LIST_HEAD(&nbl->nbl_lru);
>> fh_copy_shallow(&nbl->nbl_fh, fh);
>> locks_init_lock(&nbl->nbl_lock);
>> nfsd4_init_cb(&nbl->nbl_cb, lo->lo_owner.so_client,
>
> Reviewed-by: Jeff Layton <jlayton@kernel.org>
--
Chuck Lever
prev parent reply other threads:[~2020-03-30 14:52 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
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 [this message]
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=6BDFAB55-80A2-45D0-BC3B-CFB626AD2017@oracle.com \
--to=chuck.lever@oracle.com \
--cc=bfields@redhat.com \
--cc=jlayton@kernel.org \
--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).