From patchwork Wed Mar 20 08:46:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 13597533 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.sourceforge.net (lists.sourceforge.net [216.105.38.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 41460CD11DB for ; Wed, 20 Mar 2024 08:47:05 +0000 (UTC) Received: from [127.0.0.1] (helo=sfs-ml-3.v29.lw.sourceforge.com) by sfs-ml-3.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1rmrbE-00012m-GV; Wed, 20 Mar 2024 08:47:04 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-3.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1rmrbC-00012b-GA for linux-f2fs-devel@lists.sourceforge.net; Wed, 20 Mar 2024 08:47:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=Content-Transfer-Encoding:MIME-Version:References: In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=o0+qHOlnEi2Mgv/7eilwySkAQZ7Grwyw8boxVS1iIcw=; b=QYE7VJq3oswnxud5LFmiH6S4Fi JgZqsLFpA6dtyU+11bhRUtanP/nA7e+Sf3S8TY+43ikr5zhcVbL1e9B6oArw6G6+Z9vZEQzOXmPfO DdaGN32vJyoe6YdaBV1KzOxesd0Vimif9InB8AN9O6v0tRSnJZ9roUGjA5lS5CbZ5aeo=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=o0+qHOlnEi2Mgv/7eilwySkAQZ7Grwyw8boxVS1iIcw=; b=XJOeNT3kaqpSsVEYlZwvyeJ/u6 zZBj7byf/Yjr7Y0fOwMi3BpBc5NgsVQMB/ZFHs79oSozwL24shPFxRI5Bz6lvsutzZjcmIaJz+Qp4 Ihm+tF/XvR/QH7qntMYJzit4jkuyynLNXb2bXf0C4i4UmECToAfMw/9bozRE28/zVmW0=; Received: from madrid.collaboradmins.com ([46.235.227.194]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.95) id 1rmrb4-0007eG-Hy for linux-f2fs-devel@lists.sourceforge.net; Wed, 20 Mar 2024 08:47:02 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1710924410; bh=2Udo3G7fQC2cxqRuvgN0N9z0lkRknXjSVOSfuivtoKo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kh/iR63UC8ZHS0o2V423ngKRDPAMlLMkAT8Paiad4gxqnzpqRU4zW5zSa/jecd1FU SYFFgw01m/Z2sR4ppPva+YH4+dVtXfnb+/Oo0aMh557KlmDlyZUcDozc1LH/OOid1E lUv+1cg4wvdGjIoVSmuWxPJxFsQuVC7OiRyTNe1tzg5ypCMwz7UTSXhEJjgbEJu/2g iIfjW6cF8GLQnU5gdPa3B9mUCnMOjZXvT3VhLHLS+YEwl2p8cYRcp3bimhJpSFeHbI plLtUvP+khbz6zrhCYMMqIig/MX8JRsDQu2qaH9xZzjwzbIYSUuDbPloV9SLHxI0iL J0kkvsXCv+AKg== Received: from eugen-station.. (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: ehristev) by madrid.collaboradmins.com (Postfix) with ESMTPSA id 82D4137820FC; Wed, 20 Mar 2024 08:46:48 +0000 (UTC) To: tytso@mit.edu, adilger.kernel@dilger.ca, linux-ext4@vger.kernel.org, jaegeuk@kernel.org, chao@kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-fsdevel@vger.kernel.org Date: Wed, 20 Mar 2024 10:46:20 +0200 Message-Id: <20240320084622.46643-8-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240320084622.46643-1-eugen.hristev@collabora.com> References: <20240320084622.46643-1-eugen.hristev@collabora.com> MIME-Version: 1.0 X-Headers-End: 1rmrb4-0007eG-Hy Subject: [f2fs-dev] [PATCH v14 7/9] f2fs: Log error when lookup of encoded dentry fails X-BeenThere: linux-f2fs-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Eugen Hristev via Linux-f2fs-devel From: Eugen Hristev Reply-To: Eugen Hristev Cc: krisman@suse.de, brauner@kernel.org, jack@suse.cz, linux-kernel@vger.kernel.org, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, kernel@collabora.com Errors-To: linux-f2fs-devel-bounces@lists.sourceforge.net If the volume is in strict mode, generi c_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. Suggested-by: Gabriel Krisman Bertazi Signed-off-by: Eugen Hristev --- fs/f2fs/dir.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c index 88b0045d0c4f..3b0003e8767a 100644 --- a/fs/f2fs/dir.c +++ b/fs/f2fs/dir.c @@ -192,11 +192,22 @@ static inline int f2fs_match_name(const struct inode *dir, struct fscrypt_name f; #if IS_ENABLED(CONFIG_UNICODE) - if (fname->cf_name.name) - return generic_ci_match(dir, fname->usr_fname, - &fname->cf_name, - de_name, de_name_len); - + if (fname->cf_name.name) { + int ret = generic_ci_match(dir, fname->usr_fname, + &fname->cf_name, + de_name, de_name_len); + if (ret < 0) { + /* + * Treat comparison errors as not a match. The + * only case where it happens is on a disk + * corruption or ENOMEM. + */ + if (ret == -EINVAL) + f2fs_warn(F2FS_SB(dir->i_sb), + "Directory contains filename that is invalid UTF-8"); + } + return ret; + } #endif f.usr_fname = fname->usr_fname; f.disk_name = fname->disk_name;