From patchwork Fri May 1 13:22:59 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 226554 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E5294C4724C for ; Fri, 1 May 2020 13:51:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BB6A520757 for ; Fri, 1 May 2020 13:51:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588341113; bh=oPCGkNwJSuGnBP6t8hYYIlZeZHpRdt+KyRxwlKB/UTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nFv4QuBZvBQ5JcAOapWDQ0ZqVrALYvW28coWONE2e3Wl30oNA54OuSQ+ls2ImA7CF JK0xJ94PD4Fia+esbfwYF7Rec8HkBK9AZKl/zO4AojDXymnuYc5/1x7mvQ7zpXz3Ve 76g05lWGMKJipDDjYclyiQel2JaDOe0mNc/3QwEY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730772AbgEANvx (ORCPT ); Fri, 1 May 2020 09:51:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:37712 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730745AbgEANiP (ORCPT ); Fri, 1 May 2020 09:38:15 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 679DD216FD; Fri, 1 May 2020 13:38:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588340294; bh=oPCGkNwJSuGnBP6t8hYYIlZeZHpRdt+KyRxwlKB/UTo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YUqUhXB4Q4YxV0loRdlMoLRm6tYJjcgt+YYg1UxcF7zTCNwgTCXfqbyUw/y0c18Sm J/pwWuSMw3vIM31UlMgdKZ5t384PSBzZxbnH5beu4olRprNXRtWFJEY6d32LktcoVY a8gA96LnPLK2mIzPoJNLP/MXDeXcwaYAFq0H2zxY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasily Averin , Jeff Layton , Chuck Lever Subject: [PATCH 5.4 20/83] nfsd: memory corruption in nfsd4_lock() Date: Fri, 1 May 2020 15:22:59 +0200 Message-Id: <20200501131529.256295213@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200501131524.004332640@linuxfoundation.org> References: <20200501131524.004332640@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Vasily Averin 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 Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever Signed-off-by: Greg Kroah-Hartman --- fs/nfsd/nfs4state.c | 2 ++ 1 file changed, 2 insertions(+) --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -266,6 +266,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,