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 589B5C33CAF for ; Thu, 16 Jan 2020 19:22:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2682820661 for ; Thu, 16 Jan 2020 19:22:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579202526; bh=9WjpOy+o2A7Vfuyh8+67UVXTuQ/o1H51F7WzjDYTdno=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ee0Wg2UhT1QLZd1/tGf6HgAo/eICTxL4S14CC8L+3ErBoaXQy5Kw3Ohe11V2AoT00 uZAMreMIl/oRb6SHWdy5x3CzJ2Qjf3PgI7oVA3r0GcR2PaDCpKPHZWoGECxnmoF1UQ thXfe+3JSbhUxuMuFYpfwrFu8OzGbynVN93bFHNw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2437674AbgAPTWA (ORCPT ); Thu, 16 Jan 2020 14:22:00 -0500 Received: from mail.kernel.org ([198.145.29.99]:37400 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729732AbgAPQxd (ORCPT ); Thu, 16 Jan 2020 11:53:33 -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 DCB1F208C3; Thu, 16 Jan 2020 16:53:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193612; bh=9WjpOy+o2A7Vfuyh8+67UVXTuQ/o1H51F7WzjDYTdno=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ojutnBhum7NYXn2g5vRz1eDDZb7Ldl/3b0KeSm0dkfXudkg8QXgBOEGocbo0llzDA NG/5ShbZrsoRm2NdU01XsQgwVjS6R8xvVBqwMl2jRP7r5SpHT3jUy2nFhDdm9U7LJX Zeq8qVFfi10nNwIV/4JQQS3KLt6DTu2vRBnGEAK8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Navid Emamdoost , David Sterba , Sasha Levin , linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 150/205] affs: fix a memory leak in affs_remount Date: Thu, 16 Jan 2020 11:42:05 -0500 Message-Id: <20200116164300.6705-150-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116164300.6705-1-sashal@kernel.org> References: <20200116164300.6705-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: Navid Emamdoost [ Upstream commit 450c3d4166837c496ebce03650c08800991f2150 ] In affs_remount if data is provided it is duplicated into new_opts. The allocated memory for new_opts is only released if parse_options fails. There's a bit of history behind new_options, originally there was save/replace options on the VFS layer so the 'data' passed must not change (thus strdup), this got cleaned up in later patches. But not completely. There's no reason to do the strdup in cases where the filesystem does not need to reuse the 'data' again, because strsep would modify it directly. Fixes: c8f33d0bec99 ("affs: kstrdup() memory handling") Signed-off-by: Navid Emamdoost [ update changelog ] Signed-off-by: David Sterba Signed-off-by: Sasha Levin --- fs/affs/super.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/fs/affs/super.c b/fs/affs/super.c index cc463ae47c12..3812f7bc3a7f 100644 --- a/fs/affs/super.c +++ b/fs/affs/super.c @@ -561,14 +561,9 @@ affs_remount(struct super_block *sb, int *flags, char *data) int root_block; unsigned long mount_flags; int res = 0; - char *new_opts; char volume[32]; char *prefix = NULL; - new_opts = kstrdup(data, GFP_KERNEL); - if (data && !new_opts) - return -ENOMEM; - pr_debug("%s(flags=0x%x,opts=\"%s\")\n", __func__, *flags, data); sync_filesystem(sb); @@ -579,7 +574,6 @@ affs_remount(struct super_block *sb, int *flags, char *data) &blocksize, &prefix, volume, &mount_flags)) { kfree(prefix); - kfree(new_opts); return -EINVAL; } -- 2.20.1