lkml.org 
[lkml]   [2020]   [May]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 63/80] nfsd: memory corruption in nfsd4_lock()
    Date
    From: Vasily Averin <vvs@virtuozzo.com>

    commit e1e8399eee72e9d5246d4d1bcacd793debe34dd3 upstream.

    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>
    Reviewed-by: Jeff Layton <jlayton@kernel.org>
    Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    fs/nfsd/nfs4state.c | 2 ++
    1 file changed, 2 insertions(+)

    --- a/fs/nfsd/nfs4state.c
    +++ b/fs/nfsd/nfs4state.c
    @@ -246,6 +246,8 @@ find_or_allocate_block(struct nfs4_locko
    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,

    \
     
     \ /
      Last update: 2020-05-01 15:30    [W:4.401 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site