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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,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 5E2E1C2D0DB for ; Fri, 24 Jan 2020 11:36:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2B4572075D for ; Fri, 24 Jan 2020 11:36:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865803; bh=blAYZbvm7nn6eXGXl1eTJiZIa7ZOATrrxs34OfeT0PY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LSBzvV+Ut/N5ClMReH59hDcTyosukawmIR75zR05u6A4Os/DXuprIbBzE4bNIv2YD /RJCaFehRjAZYlJkeSD7P4GcDkjCG9Mfgr9PG6JULeYsw/MouK+oQbbfHcleknrUk1 T0EUY9tHCPu/xo05XLmnM1T4rCgUnd7cRk2iYaYQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404782AbgAXLgm (ORCPT ); Fri, 24 Jan 2020 06:36:42 -0500 Received: from mail.kernel.org ([198.145.29.99]:56834 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390172AbgAXLgg (ORCPT ); Fri, 24 Jan 2020 06:36:36 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (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 4D9E3206D4; Fri, 24 Jan 2020 11:36:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579865795; bh=blAYZbvm7nn6eXGXl1eTJiZIa7ZOATrrxs34OfeT0PY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KdGKq1hwcnxN0JpQxDuSHITt6GmfAiQCrQw9hi+MydY2m115PdpZsVkg/93POkj9V ZrrLIkvNoEM7nehLvPIK2/OIRt28OrINioYZ0TlcbhQFfxKWc7fwAcUmWGSL+Re+0G LL0Sj07Gi8Dl22NWcdqf+iCHC9Y3MelDa6WS/6aU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Navid Emamdoost , David Sterba , Sasha Levin Subject: [PATCH 4.19 629/639] affs: fix a memory leak in affs_remount Date: Fri, 24 Jan 2020 10:33:19 +0100 Message-Id: <20200124093208.423223207@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 d1ad11a8a4a59..b6ce0c36029bd 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