Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp5805037rwb; Tue, 1 Aug 2023 08:08:48 -0700 (PDT) X-Google-Smtp-Source: APBJJlEJIvlLHcNopo335vXqgJAtE9aDDw7XLwx0RSv3bPICbG+vyDED8s6nHTa7k9LFFGMsUOJH X-Received: by 2002:a05:6512:3ae:b0:4f8:4177:e087 with SMTP id v14-20020a05651203ae00b004f84177e087mr1912867lfp.47.1690902528001; Tue, 01 Aug 2023 08:08:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690902527; cv=none; d=google.com; s=arc-20160816; b=ZQtf/t5YnRKWsexpqKXv1K3Kdb1EEoomJBkeJgzYp9nuUT/JeSAwEof50dDKi0wi+q mYJfOvjOYHQoW0P6qE+iK16WFNQt729FN8LdV2xWkmAGNmnQlUfZWWAPvAtBmtgq7xbT F3RvYmgRA4Vsl0LNSLBsCDxGBDduPCyqvCwPqGmkY3qRGNHlL91UHLcCQZcLI93B7WWX Te7bV4FXif1/NSA2F40GXblcv806YVT29Izcw7iVIv9PmXwxFX+BUuwFX8WDe9Z4s8ht yWAZDXoVnUIWhQUKzCBTEuZAzavwXDJUBoPQYP5wOiw5g7GISVq7YaSdrunj/jF284PY 3wXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-signature; bh=L4scspEofNFZsqaoPa/uagvn9jfb5SNDwDcPebxybj8=; fh=JYaWYeLjwbsjMwCf/2VPhfvpjXUb3Ona0cK/uW8PAt0=; b=fFZtNE36wwgJGj83D5S79DRX9O//7QdQQWJHr2HQKPXH44HVuavxtecTvnv/ru/tAG +ILS/k0JzlncfpcaImkG2jxCbk4T3fp+0tlHGyEOtmPtsSd0eI0kl8b87j4JyzZ9EahY 3Z1oIxKAxqwM9Qu1iepDnyy0LAK9ecw46Ur9Hls2ibAiu8bznH4eAgvuHeHlHGRHbrcy 8uc7vphGOhoYj4q0RkqXFChv6SQkvcp/43G+taEiWcopCJEl/4C53/tBZIN8N4tNVSBP 5S76u6OjGa4dg48xBHQ9PE9V0cgx/t67TIwgMGBlEGoUUZgQDbPnwGHKIrBrOxL874T4 h8FQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=wbpIQRBA; dkim=neutral (no key) header.i=@suse.de header.b=3suknXgZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l21-20020aa7d955000000b0052228fd2325si7826953eds.267.2023.08.01.08.07.57; Tue, 01 Aug 2023 08:08:47 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=wbpIQRBA; dkim=neutral (no key) header.i=@suse.de header.b=3suknXgZ; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234862AbjHAOlo (ORCPT + 99 others); Tue, 1 Aug 2023 10:41:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234590AbjHAOll (ORCPT ); Tue, 1 Aug 2023 10:41:41 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D7DF9C; Tue, 1 Aug 2023 07:41:40 -0700 (PDT) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 398301F45A; Tue, 1 Aug 2023 14:41:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1690900899; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L4scspEofNFZsqaoPa/uagvn9jfb5SNDwDcPebxybj8=; b=wbpIQRBA4leKtrWq52bsLBPy3dasXNlM83tBFXuy6DKfjbbfTiHo+axech1TR9YcAjNFxm rruFVUXEQoNC/kW3TJ9jrT4seEJpEv75/6nSGYF7FSYR7vzHmoB1sl/CZWr5a5BTiUG5Sj 0PBJqhyyRCZJsfr0YQPhrvRKReLjLMQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1690900899; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L4scspEofNFZsqaoPa/uagvn9jfb5SNDwDcPebxybj8=; b=3suknXgZXNbb7oxlw6YY9Gz9wN78Da5aPmMCq+EIw5P0h66ZrtxdI+PODTd1UhKripPE6m m03MKfp5kmaluABg== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C7F8A139BD; Tue, 1 Aug 2023 14:41:38 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id 8CbhLaIZyWSOawAAMHmgww (envelope-from ); Tue, 01 Aug 2023 14:41:38 +0000 Received: from localhost (brahms.olymp [local]) by brahms.olymp (OpenSMTPD) with ESMTPA id 3bec45b3; Tue, 1 Aug 2023 14:41:37 +0000 (UTC) From: =?UTF-8?q?Lu=C3=ADs=20Henriques?= To: "Theodore Ts'o" , Andreas Dilger Cc: linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org, =?UTF-8?q?Lu=C3=ADs=20Henriques?= Subject: [PATCH] ext4: fix memory leak in ext4_fname_setup_filename() error path Date: Tue, 1 Aug 2023 15:41:36 +0100 Message-Id: <20230801144136.23565-1-lhenriques@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org If casefolding the filename fails, we'll be leaking fscrypt_buf name. Make sure we free it in the error path. Signed-off-by: Luís Henriques --- fs/ext4/crypto.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/ext4/crypto.c b/fs/ext4/crypto.c index e20ac0654b3f..9e4503b051c4 100644 --- a/fs/ext4/crypto.c +++ b/fs/ext4/crypto.c @@ -33,6 +33,8 @@ int ext4_fname_setup_filename(struct inode *dir, const struct qstr *iname, #if IS_ENABLED(CONFIG_UNICODE) err = ext4_fname_setup_ci_filename(dir, iname, fname); + if (err) + fscrypt_free_filename(&name); #endif return err; }