Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1114117iob; Wed, 18 May 2022 22:45:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxw8QTQKgz1g3KdfjkZ/XU7O4KjcJUmz23HpQFNmvkhQmBoxL0GWfnuublQDMvIdmvMkJLe X-Received: by 2002:a05:6a00:10d3:b0:4fe:5d:75c8 with SMTP id d19-20020a056a0010d300b004fe005d75c8mr3220692pfu.6.1652939107844; Wed, 18 May 2022 22:45:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652939107; cv=none; d=google.com; s=arc-20160816; b=F6+/lWMhQFQLcyFByYQgYdHHfDrpoRmO2OlJVoC9FJtHjSDcqcv8JBt+OZEwlBOIUH cda7iN3CHqJ0M/6LNz+VPmMOAEZQXjuaNJvszrCnmTbaTx8IC5FggIjr4TmQy8i5E/l9 AuaCDVXLkNDRa31/dAx8M7tE4m056s4VcxSkfsLusFMIgYFbe6xPoPxTyCvw1/LUvFfF 4IzrDnA2eYwWg5W4SkDZEjfuyXq90KBKmj5q4I5syS3qp58ZY3mTrjDS77BeAA1HkEj7 2VfGHuwkc9mW9C9K2YIwPjHnRy3e3wEM9mppdklzDy09/BV1BIdAAhz4tRCK6e2oX37V 9ECg== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=atre0gevBapG892Z5MCr4UG6DoQZjiUC2HRYoTG/Dic=; b=IJviypxymn4nnCXWoISBnr/Axk2X0M7FV0icRQ/vn14aTVMWGx6KFHTGLqxk2oKw5g 4ijJE5tclymqQkIIF4FvY3gdh2FfQG31T5j616QzyFHDkg74WKXm2+LsqVoDq/FAdQw5 wLYTGkdtVTE7aBgqwHvTFJLyIiSpuHRcRkaYr7FUEIUfCKCd71Uki62wX7kLbO9l7JKU Bq8UgdvU/Ipc3YfHICjr7oOehK7/f7Holg71TH9JRvsIXPvHC28KG6jbk1imhdmqGB9n wtajVj/MsbRQP/yczMMEXcAsQlvh8BSwv+noTEaxrjvv7zVO/cLn6Mid0Q/342IE+Oh+ OPZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=S4f3Lpbj; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y17-20020a637d11000000b003f60c9617f9si4121276pgc.268.2022.05.18.22.44.47; Wed, 18 May 2022 22:45:07 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-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=@collabora.com header.s=mail header.b=S4f3Lpbj; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230150AbiESBlo (ORCPT + 99 others); Wed, 18 May 2022 21:41:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232569AbiESBlY (ORCPT ); Wed, 18 May 2022 21:41:24 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94FD96C0C6 for ; Wed, 18 May 2022 18:41:23 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id 3E05C1F45360 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652924482; bh=j8df1m1ueLIlcWV9hGb6El2JjRXuC81I9Nolg4K+vGk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=S4f3LpbjQilmM/4gPEAXf//62irWB+u+G4oJcb7xk0RELrFoaNa5wfnZny7cgGUBW dD8k36a5HJxHKdeic6ZFNrKApaoB5lsvhyejXH9aeIWZdk+So1FoPt3Juo+Q3/NFpn WjpPVOsjGh+H1AfgsetAw2g7TVxSe6Iin6D0X6Eel5BUL71OjoddbpwRQp+b099z1A AQGBkBKRbQmBzPMUdEH9m6yQm1nnrWX1NUo6xu/WYeIjnJ+tDYgSA+Aj14e9Fi/qz7 4/y6StMqgSXKC2J55sdyRJgW6ZGSo5WkTbPbR1vQO39XiBl7vQ0v7PExAwxtB4ODUg jcY5Ha5cviYjw== From: Gabriel Krisman Bertazi To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org, ebiggers@kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Gabriel Krisman Bertazi , kernel@collabora.com, Eric Biggers Subject: [PATCH v6 6/8] ext4: Log error when lookup of encoded dentry fails Date: Wed, 18 May 2022 21:40:42 -0400 Message-Id: <20220519014044.508099-7-krisman@collabora.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220519014044.508099-1-krisman@collabora.com> References: <20220519014044.508099-1-krisman@collabora.com> MIME-Version: 1.0 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,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,UNPARSEABLE_RELAY 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-ext4@vger.kernel.org If the volume is in strict mode, ext4_ci_compare can report a broken encoding name. This will not trigger on a bad lookup, which is caught earlier, only if the actual disk name is bad. Reviewed-by: Eric Biggers Signed-off-by: Gabriel Krisman Bertazi --- changes since v4: - Reword error message (Eric) Changes since v1: - reword error message "file in directory" -> "filename" (Eric) --- fs/ext4/namei.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 98295b03a57c..8fbb35187f72 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1396,6 +1396,9 @@ static bool ext4_match(struct inode *parent, * only case where it happens is on a disk * corruption or ENOMEM. */ + if (ret == -EINVAL) + EXT4_ERROR_INODE(parent, + "Directory contains filename that is invalid UTF-8"); return false; } return ret; -- 2.36.1