From mboxrd@z Thu Jan 1 00:00:00 1970 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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,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 664E2C28CBC for ; Thu, 30 Apr 2020 14:00:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3CDC4206D9 for ; Thu, 30 Apr 2020 14:00:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588255254; bh=7MDlnzUmyvtZuMwcmGG1rnivyMahY/GeuHpcLFENqYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=cz2+Kl6kfC0ogkMvkgc7nbaICHpgW/B/0GZ0bhadbpQsJp5Qt6JuFftWOzZR/4hTl Aky61AlFkvjyisvOHHglHcs9YPFIcyXLiTfk59PaTzgmWGgHCxjZ6BHqSlJRoDZF9M FdnHuv0Rdb6F/oaoHMygpQCo6U6BV5AiJAK3XTIo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727844AbgD3OAx (ORCPT ); Thu, 30 Apr 2020 10:00:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:36288 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728890AbgD3NyH (ORCPT ); Thu, 30 Apr 2020 09:54:07 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C5C822495D; Thu, 30 Apr 2020 13:54:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588254847; bh=7MDlnzUmyvtZuMwcmGG1rnivyMahY/GeuHpcLFENqYo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mcmTprrl4RmFS+nE85BV/WeniaG+4uDLTyk+LBNYCx5ebCB70kVdKB1qXIMqxqwCF WssK89P2FCKcsic3CH2i7Vny60YUPOzpPcc12G0yJSqvEcJ84MXLtTrUVVtmwww2m4 pjKF8h1wbcKf9yzGgIG5E0mJnC7P1CFWjeKCagCE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Vasily Averin , Jeff Layton , Chuck Lever , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 04/27] nfsd: memory corruption in nfsd4_lock() Date: Thu, 30 Apr 2020 09:53:39 -0400 Message-Id: <20200430135402.20994-4-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200430135402.20994-1-sashal@kernel.org> References: <20200430135402.20994-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Vasily Averin [ Upstream commit e1e8399eee72e9d5246d4d1bcacd793debe34dd3 ] 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: Sasha Levin --- fs/nfsd/nfs4state.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfsd/nfs4state.c b/fs/nfsd/nfs4state.c index fca8b2e7fbeb7..d5d1c70bb927b 100644 --- a/fs/nfsd/nfs4state.c +++ b/fs/nfsd/nfs4state.c @@ -246,6 +246,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, -- 2.20.1