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,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 7E24EC2BA83 for ; Fri, 14 Feb 2020 16:01:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4D9D924654 for ; Fri, 14 Feb 2020 16:01:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696088; bh=fWkVieqX4+okU8uVSg0m7NTofCEOdf4K60FWuuLXt9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fVy+aqSxa/N0d+IGgNZJb4yObxuarKmzhNJlWoWkbzqw4oLDl7cN1Z2SohtgXm/9F nnOxFdpI1GwV/aOGJRodgA3kOnQ40KmghCbx5v1NUQou2T4YGHBGFQMOc0L5MOVajO p3Dc2U0iS6vxacJOsW0sES82sYTNlphP5+Qhn3+4= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388489AbgBNQBW (ORCPT ); Fri, 14 Feb 2020 11:01:22 -0500 Received: from mail.kernel.org ([198.145.29.99]:45522 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389092AbgBNQAP (ORCPT ); Fri, 14 Feb 2020 11:00:15 -0500 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 2C3C524681; Fri, 14 Feb 2020 16:00:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581696014; bh=fWkVieqX4+okU8uVSg0m7NTofCEOdf4K60FWuuLXt9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kkfg0LkLSMRg4CQEm7e4XVogPHn44+O4nhE9YO5x0qvL7aRg1qzGZhWgOP0MPzogE 3qDAdztgZvLpaXhGxnS/eKcdg3TqNxomrsoZFjw9y9UKxDCZl/BZLEFy8zWqMVd04a RBE/bF7Yvz+JZxfpdRnOX9lIX20b4rp6tTDR+VUQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Wenwen Wang , Anna Schumaker , Sasha Levin , linux-nfs@vger.kernel.org Subject: [PATCH AUTOSEL 5.5 531/542] NFS: Fix memory leaks Date: Fri, 14 Feb 2020 10:48:43 -0500 Message-Id: <20200214154854.6746-531-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200214154854.6746-1-sashal@kernel.org> References: <20200214154854.6746-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Wenwen Wang [ Upstream commit 123c23c6a7b7ecd2a3d6060bea1d94019f71fd66 ] In _nfs42_proc_copy(), 'res->commit_res.verf' is allocated through kzalloc() if 'args->sync' is true. In the following code, if 'res->synchronous' is false, handle_async_copy() will be invoked. If an error occurs during the invocation, the following code will not be executed and the error will be returned . However, the allocated 'res->commit_res.verf' is not deallocated, leading to a memory leak. This is also true if the invocation of process_copy_commit() returns an error. To fix the above leaks, redirect the execution to the 'out' label if an error is encountered. Signed-off-by: Wenwen Wang Signed-off-by: Anna Schumaker Signed-off-by: Sasha Levin --- fs/nfs/nfs42proc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/nfs/nfs42proc.c b/fs/nfs/nfs42proc.c index 9637aad36bdca..e2ae54b35dfe1 100644 --- a/fs/nfs/nfs42proc.c +++ b/fs/nfs/nfs42proc.c @@ -343,14 +343,14 @@ static ssize_t _nfs42_proc_copy(struct file *src, status = handle_async_copy(res, dst_server, src_server, src, dst, &args->src_stateid, restart); if (status) - return status; + goto out; } if ((!res->synchronous || !args->sync) && res->write_res.verifier.committed != NFS_FILE_SYNC) { status = process_copy_commit(dst, pos_dst, res); if (status) - return status; + goto out; } truncate_pagecache_range(dst_inode, pos_dst, -- 2.20.1