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=unavailable 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 17075C2BB55 for ; Wed, 15 Apr 2020 13:12:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E712120936 for ; Wed, 15 Apr 2020 13:12:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586956332; bh=jO1jmMq/YmarATDf7hjoodFLJI0M50FJ/PJsvVCWaBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yfAPXGAg9BwAt7tiu9O3c2TSZujkbjC/AS+JgOdjciPHGCAaNILLmdfeiU9LRXEl4 sIFRVgMUhLlTww7X7HVQgng/RVnksy5ClGF7u2X8UZOQDOPNMWb2J3cT3Zt+apDcRs ta+doHpKZ+ZnKXQ0xoxVnaEjvFGAoOeaT0aEqO1k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2506122AbgDONMK (ORCPT ); Wed, 15 Apr 2020 09:12:10 -0400 Received: from mail.kernel.org ([198.145.29.99]:55172 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2897064AbgDOLfi (ORCPT ); Wed, 15 Apr 2020 07:35:38 -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 B98DE20768; Wed, 15 Apr 2020 11:35:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586950535; bh=jO1jmMq/YmarATDf7hjoodFLJI0M50FJ/PJsvVCWaBA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W5j9w2vv8W4i+RUlkHSrRRDj3/nReGePV7s2E4njEXJtaJ9RWuEw2Y1251ayXXiC2 Rsk/SfnFSXeSIxpkn1xR2Xac+n1GA1oFcXp2dFASJMQ17NKOdcHsDSfNuqp5TXXrE4 YROy591PkYkpOM5RQmF9cqCW9lZCNOiw4rexPwkc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Misono Tomohiro , Trond Myklebust , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.6 043/129] NFS: direct.c: Fix memory leak of dreq when nfs_get_lock_context fails Date: Wed, 15 Apr 2020 07:33:18 -0400 Message-Id: <20200415113445.11881-43-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200415113445.11881-1-sashal@kernel.org> References: <20200415113445.11881-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Misono Tomohiro [ Upstream commit 8605cf0e852af3b2c771c18417499dc4ceed03d5 ] When dreq is allocated by nfs_direct_req_alloc(), dreq->kref is initialized to 2. Therefore we need to call nfs_direct_req_release() twice to release the allocated dreq. Usually it is called in nfs_file_direct_{read, write}() and nfs_direct_complete(). However, current code only calls nfs_direct_req_relese() once if nfs_get_lock_context() fails in nfs_file_direct_{read, write}(). So, that case would result in memory leak. Fix this by adding the missing call. Signed-off-by: Misono Tomohiro Signed-off-by: Trond Myklebust Signed-off-by: Sasha Levin --- fs/nfs/direct.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c index b768a0b42e82e..ade2435551c89 100644 --- a/fs/nfs/direct.c +++ b/fs/nfs/direct.c @@ -571,6 +571,7 @@ ssize_t nfs_file_direct_read(struct kiocb *iocb, struct iov_iter *iter) l_ctx = nfs_get_lock_context(dreq->ctx); if (IS_ERR(l_ctx)) { result = PTR_ERR(l_ctx); + nfs_direct_req_release(dreq); goto out_release; } dreq->l_ctx = l_ctx; @@ -990,6 +991,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter) l_ctx = nfs_get_lock_context(dreq->ctx); if (IS_ERR(l_ctx)) { result = PTR_ERR(l_ctx); + nfs_direct_req_release(dreq); goto out_release; } dreq->l_ctx = l_ctx; -- 2.20.1