Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp678095iob; Wed, 18 May 2022 10:25:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzY+M/iMVwV3Qu08eFUQ57L3fuh7RVvgSaCpGujsxTtW8AScGm4P5KNJ8qWqcE7HqqJhtdw X-Received: by 2002:a63:1d4:0:b0:3c2:479d:39e0 with SMTP id 203-20020a6301d4000000b003c2479d39e0mr403343pgb.427.1652894718085; Wed, 18 May 2022 10:25:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652894718; cv=none; d=google.com; s=arc-20160816; b=onyY6XVut57miKvJuvP7rlV3au6fh6M47YVEblxwIvsleWMVNogg7QPEvEuhHbrxzP MNg+HKf/Ou7GrhkC9OnnsOSbd/LKgaeeDF9KSODC5U+2F2Df+lHULH8cww5psQkFNcv9 49UhJ51RsVLsIef7YiLNhArwaT/aNqf6jwsWccAe3dTQCLaRle32OkEwF+mVNhaDAuVl GkzBMds4efupWYKzLd44PRcE0Wzml/JJfSF5CuqWUEXG4agKQdbaLYXZZTlkf7HLgnYH hFt04zgkZ4PE3B7xJRkEALUvmY4eshtBWe3kuOte2Kw1CaoOWKLB7PZxlpOB1q46Y45N NZqg== 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=kDnDKSHhoqmAZH6XINdrv04yusWiyusSb1ohf9ynA1U=; b=apuVIEZXCaQ1wyqYGUZqwvDXnvu2E8R2TtbX4VeMM/BYPA8AJ5D68Rvcxzro0HViuP WdBlZ//FBQg+IniT3ZDpdAmTClTToq0qWBTWhmkTzfRQdFBVAVEdUY/SW3jYMujEQJvo 9V2OM3fewjRfnQtk6+t2qHW0VoVok9AUejaKgR4zCc9fWvG7GRXoVDhGO+YhIn4MgiYo 6KRP/y7P0zTIhXvoXFtO2K9ZfOrJn3EuZZ9q6cM1+4Yvx6W7qIegDUyUR+lOG4RRWJBZ bYIhENv/wm5shNjRS+Du6o0OqO9r8js2u8YYCISnTdjbX5znjhlf67PSEeDcXhJO5DXa TLkA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=JvDD9PqG; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:18 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 lindbergh.monkeyblade.net (lindbergh.monkeyblade.net. [2620:137:e000::1:18]) by mx.google.com with ESMTPS id l6-20020a170902f68600b0015cf060b23bsi3683839plg.583.2022.05.18.10.25.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 May 2022 10:25:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) client-ip=2620:137:e000::1:18; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=JvDD9PqG; spf=pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 2620:137:e000::1:18 as permitted sender) smtp.mailfrom=linux-ext4-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 858711A90CA; Wed, 18 May 2022 10:24:02 -0700 (PDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240982AbiERRX6 (ORCPT + 99 others); Wed, 18 May 2022 13:23:58 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240979AbiERRXy (ORCPT ); Wed, 18 May 2022 13:23:54 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 44A2D1A4917 for ; Wed, 18 May 2022 10:23:53 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id DE34A1F4549A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652894632; bh=wEtELicV/Q3JgBPpviNuE9QAVFCxhQ4MrH/zciZ2jSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JvDD9PqGqVe9idcKeP/5BPsrOm30CD3qFzcJrCRWAjz6XyTG5aTIpiQXcW0Rtq74H aQWcU7xpburVefpdH22KFhdKdYSoWfe97I4Xw37WDbzPRPLFLvTL0c40IIuDepAx1O gvIpzJoXEadbJVxKVd4AjPPHxcDG61CU88q+X/61DSEBi70F03KnRMoa5eeZCf3v3T Xk96TiP6hulALd447W9eaqF7EStmqe8rX2imRkCM8SP/sRSfTHVZyO9g20vribizso Bk5AZJ5vumlWhAHDkVLs5CRi38SxSpm4NvRIcwKDMT3sDXUs1nSQ937J3OGFA9weFG F/Lgp3l7t3h3Q== 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 Subject: [PATCH v5 6/8] ext4: Log error when lookup of encoded dentry fails Date: Wed, 18 May 2022 13:23:18 -0400 Message-Id: <20220518172320.333617-7-krisman@collabora.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220518172320.333617-1-krisman@collabora.com> References: <20220518172320.333617-1-krisman@collabora.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RDNS_NONE,SPF_HELO_NONE,T_SCC_BODY_TEXT_LINE, UNPARSEABLE_RELAY autolearn=no 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. 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