Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp2045764iob; Fri, 20 May 2022 00:00:33 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz1SHptnnadSvLukTr1Kd1rr58FTfocvHlQl9OjT6cHwtnVgK5p455oETgL9zzIBMT+BgRQ X-Received: by 2002:a17:907:3f8c:b0:6fa:8b15:66fe with SMTP id hr12-20020a1709073f8c00b006fa8b1566femr7576394ejc.142.1653030033610; Fri, 20 May 2022 00:00:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1653030033; cv=none; d=google.com; s=arc-20160816; b=YnsxZIOxyrIxJdpkruXq9u8FjnxldS79gPyQfbI5a7XLtOKtbEIYrvcKy/RtqO5yjN BG2YhGXJIj6cKDq+wLdSCg78W6F0QqRtPTZ7uMN5evK3PvYIAokSDPHKLmo7vABPXfRE pDByPPbqapIDanqLJHfZCx7db4uL4tn2HWyRo3ySN0MmOeEzikLhjCsmwAR5Tgy4yHIl Q/c5c5AK9pw1z+anFi5+yVnc2GANtwVU1uG800JsgPWJLAupOzDKEV8x3Q8yL4jTxgKA 4F72vwZ2mbkipv5QaWJrqlEmIsQ3WW0mPZR819HlyJg1MxFTuuAEgSeQPwpjODwVtbHi QQnQ== 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=h2xhxQiI8y+UVuJOrRpmlGqnyOFyMyi9KoVuIJm2Y9E=; b=HrRZ80JvOM43c4Nm5zzWgjTaIY0hmTEHbzfCHsAawN7rwdbAtTIkuc1I+yJdd+PYEA 5WxUi43AwIMhvuWsVuI/AbK6vPmE+CkcFTpWfgy+ffFjnHDUYZ2bNmBwv6MTEQmUsYQS 1yKSuDOXkLyQApTylkgqJuKZopiUDjW6ycl/63cfGnz07dbjCXZBzTl/GSUebFhAjA94 M2LM5EaoLMlcVfgfvdc+HM2KrrUQoXowTynxlDyrKQ/7l4rL1ZEJLWd/0ERHVgKjKYcn aaXFKkgGcim11Zq96En+uxznb1bL8cqLcSc3m8sK3m3/inh1y4pN7aeoex38mjA4yT4I t1cA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=OKmOKKuB; 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 hc16-20020a170907169000b006e7f47d22a9si9176178ejc.434.2022.05.20.00.00.07; Fri, 20 May 2022 00:00:33 -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=OKmOKKuB; 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 S244796AbiESUrQ (ORCPT + 99 others); Thu, 19 May 2022 16:47:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244784AbiESUrN (ORCPT ); Thu, 19 May 2022 16:47:13 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 12EB9326D2 for ; Thu, 19 May 2022 13:47:12 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id BA7EF1F4541F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652993231; bh=M0TLs16gnY6Il6I/gjDxltCLo80eOfsQXUv+A05frpQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OKmOKKuBiKoZUWrPq5KGfLwDltQMzOtgH7697UjH8TlhKWXb2ZyBiHoObI3NbS9iN 58fV6Woayp8DGzdMl9r6Wp+E+gwMdf9kDe1Y23w3XkH9zlSA2sRtB1yd4VQVyZj4fF wyZqRdkvyz25s+WwMWTwIjCbxdiPjoO76V+LekH0Xy4yVdCE/VnD1FUpk4lkenGGJf PiUR/4V5WQ3b+J46f2wfrZVuK/tofuUdW77NURr8GmT4zy0W5eixq9ksVqlcAKjJu3 JLTFg8oKvs4BzDLczc4Fd6xV1yPt1jN2980GmMBO6MG7JDs35nzoZEE87gpS54MmWh 1DFFwS5xgSO+g== 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 v7 6/8] ext4: Log error when lookup of encoded dentry fails Date: Thu, 19 May 2022 16:46:43 -0400 Message-Id: <20220519204645.16528-7-krisman@collabora.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220519204645.16528-1-krisman@collabora.com> References: <20220519204645.16528-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 5e68dd6ad9b8..f4593dc3e593 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1406,6 +1406,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