Received: by 2002:a05:7412:cfc7:b0:fc:a2b0:25d7 with SMTP id by7csp1603000rdb; Tue, 20 Feb 2024 00:57:02 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUyLr7fu1eThed6eaURJTI9J3CgLdxs62aMX5+W9gxSDHHd+fCoJRzmj8Z4cjkoBuUxAoXm+mZifqO6czOCCIhHukYnrnw6IlFrc+8J/w== X-Google-Smtp-Source: AGHT+IGVNc2o6xO2QhaIsLS0GvoExDWkTkmEYKWymmP+C2p5HyGPJNb0bkZnTYlgy/InAQTlrUh4 X-Received: by 2002:aa7:d997:0:b0:564:71d1:6cbe with SMTP id u23-20020aa7d997000000b0056471d16cbemr5321425eds.35.1708419422337; Tue, 20 Feb 2024 00:57:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708419422; cv=pass; d=google.com; s=arc-20160816; b=Cy2u8SIfY99oG0fKOUmiKhfcV/odVwCxfA6E4zG2o9paKcgaX/zwJugDdRg8fTzWPb bpVIjzGH+NyQP6zMFkxLw2uqKuKmLY5d0z/whxgEkNdXlagA3WgnPwuB4bEEeU5LNVhC gZKozgrYIYav9WK1hLkp3iZiaPDLpQAlu+7LKuyGV9a5DZStqLDLwzPqb3MmVQ1zQeCk 1KI5GGD/dlMd5Ums8PAxGA43X0y6t6THrIyQMbg5jtbKDKe3FCBLsRTdgaJG9x9QKTZz lsCmkcVmDYPQcOC5jyATZnD7CvdQd8vO60hAhRmTIZLEqGCeeft9pReCFkLd47Vtp9pv SY7A== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=oktS/MBFoF+x9yONCrKAEawd+NT7G/N3oFpCIujtcCI=; fh=zf0NNkRrVzzNLxoWnmq9qpFBuYVKEQmjRPQIjT6JsCY=; b=VpmV454YlOVV8oxWDd84t2z3tRjdP+alMnU/CUC7396Q7c1PDTCiqLFXs8afAkEKXL GlllO3JjqOPWFUcHYHCp1P0L1uWDg3Le76NElPgbfs60FkRGSd0kmBD7pwgJuTiXjYzU 8GNhxOSBWIH7kjlsP4DYHMWvTR/rFmtfgcluKptM/E3pFl2ZiPb/4hX6/KejO7bOk9uc 4mtS55+PXH6rep0Div59xNfzg0nny5M8IpS1LiE5S1KahSRohIg0Qv/nK8L8Ll9P+FYp /vqrNvhQ7RWyMQLZE+MMBDZV1Cmg6RSe/3d2G83b6HuXrXn+QG7QoInf+468covbY5dc DVCw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="H16jRp/s"; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-72615-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72615-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id r16-20020a056402235000b005643d68473fsi2517717eda.206.2024.02.20.00.57.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Feb 2024 00:57:02 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-72615-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="H16jRp/s"; arc=pass (i=1 spf=pass spfdomain=collabora.com dkim=pass dkdomain=collabora.com dmarc=pass fromdomain=collabora.com); spf=pass (google.com: domain of linux-kernel+bounces-72615-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-72615-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id E223F1F22008 for ; Tue, 20 Feb 2024 08:57:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 91299657B7; Tue, 20 Feb 2024 08:53:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="H16jRp/s" Received: from madrid.collaboradmins.com (madrid.collaboradmins.com [46.235.227.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2FCD5651B0; Tue, 20 Feb 2024 08:53:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=46.235.227.194 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708419187; cv=none; b=AO7Foj+wE526xxhcwOuTq1AO0eqSFSH4X1NXGbzOMA78gai5m1U6T6IimJwby6Sf3UznWkhdt0Khu3CfiOOQ4eXSmbMX4axTlBQhiG0tas/iyZ2PONg8nGEQpVu6cGVRp7LGQmuB8SlHcFBZNUU8FA8bkaoX70kDumPrkq3HtQE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708419187; c=relaxed/simple; bh=Hp90mLjR44WCv/VB4t8dflfSiAXrxxn0/qF/zsP/e4I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ikipXI/gP+ua4RzxU6QZHPAJN2inplJA+x0p77wKTL//cgg5TOM4lqbFGJjsPkVqj+C04OpwEAX6rMOHwDOldzA4V0+jAkwLFlkgtXahb8ZmRnVWRwQ07pW/9QjWnq8wwIiThtcxZR/9/g2QfpjPdDR6jpI6+T1gbCdfX9Fjw68= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com; spf=pass smtp.mailfrom=collabora.com; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b=H16jRp/s; arc=none smtp.client-ip=46.235.227.194 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=collabora.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=collabora.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1708419184; bh=Hp90mLjR44WCv/VB4t8dflfSiAXrxxn0/qF/zsP/e4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H16jRp/sNexVtn9iSjMmTvR75g9t9Tp7aA51msvJmECvnCgYQfEImMIuQ6yN8JG0+ jX6L6yYjOyY4vXhhnCAXffD6/Lhm6s47fE5u5GYgzQvtZMV56cAwFhNhsX1KDfntNX Wlry5q73PYQNKJEYQdMpv+gAaMBb8q8FJXP0Bf+cps/XszhE7ItxdOH1CHQsXzptiL U3uSjAZBUKGD/UrGR6w93+c2sPOLMJL+hmhK/CUU5GwdBv6qDOVYIKctk0PWeCPKUJ ngPujiw0MIFM6xBpPcUqf2ixFA/ajKZy+x/C+oTUEvHV3II1dZ5iaGC/jYCNyX1G5F gCCZ4YbhJSCCg== 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 DA700378208E; Tue, 20 Feb 2024 08:53:00 +0000 (UTC) From: Eugen Hristev 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 Cc: linux-kernel@vger.kernel.org, kernel@collabora.com, eugen.hristev@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, krisman@suse.de, Gabriel Krisman Bertazi Subject: [PATCH v12 4/8] ext4: Reuse generic_ci_match for ci comparisons Date: Tue, 20 Feb 2024 10:52:31 +0200 Message-Id: <20240220085235.71132-5-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240220085235.71132-1-eugen.hristev@collabora.com> References: <20240220085235.71132-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Gabriel Krisman Bertazi Instead of reimplementing ext4_match_ci, use the new libfs helper. It also adds a comment explaining why fname->cf_name.name must be checked prior to the encryption hash optimization, because that tripped me before. Signed-off-by: Gabriel Krisman Bertazi Signed-off-by: Eugen Hristev --- fs/ext4/namei.c | 91 +++++++++++++++---------------------------------- 1 file changed, 27 insertions(+), 64 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index e554c5a62ba9..6e7af8dc4dde 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1390,58 +1390,6 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block) } #if IS_ENABLED(CONFIG_UNICODE) -/* - * Test whether a case-insensitive directory entry matches the filename - * being searched for. If quick is set, assume the name being looked up - * is already in the casefolded form. - * - * Returns: 0 if the directory entry matches, more than 0 if it - * doesn't match or less than zero on error. - */ -static int ext4_ci_compare(const struct inode *parent, const struct qstr *name, - u8 *de_name, size_t de_name_len, bool quick) -{ - const struct super_block *sb = parent->i_sb; - const struct unicode_map *um = sb->s_encoding; - struct fscrypt_str decrypted_name = FSTR_INIT(NULL, de_name_len); - struct qstr entry = QSTR_INIT(de_name, de_name_len); - int ret; - - if (IS_ENCRYPTED(parent)) { - const struct fscrypt_str encrypted_name = - FSTR_INIT(de_name, de_name_len); - - decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL); - if (!decrypted_name.name) - return -ENOMEM; - ret = fscrypt_fname_disk_to_usr(parent, 0, 0, &encrypted_name, - &decrypted_name); - if (ret < 0) - goto out; - entry.name = decrypted_name.name; - entry.len = decrypted_name.len; - } - - if (quick) - ret = utf8_strncasecmp_folded(um, name, &entry); - else - ret = utf8_strncasecmp(um, name, &entry); - if (ret < 0) { - /* Handle invalid character sequence as either an error - * or as an opaque byte sequence. - */ - if (sb_has_strict_encoding(sb)) - ret = -EINVAL; - else if (name->len != entry.len) - ret = 1; - else - ret = !!memcmp(name->name, entry.name, entry.len); - } -out: - kfree(decrypted_name.name); - return ret; -} - int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname, struct ext4_filename *name) { @@ -1503,20 +1451,35 @@ static bool ext4_match(struct inode *parent, #if IS_ENABLED(CONFIG_UNICODE) if (IS_CASEFOLDED(parent) && (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) { - if (fname->cf_name.name) { - if (IS_ENCRYPTED(parent)) { - if (fname->hinfo.hash != EXT4_DIRENT_HASH(de) || - fname->hinfo.minor_hash != - EXT4_DIRENT_MINOR_HASH(de)) { + int ret; - return false; - } - } - return !ext4_ci_compare(parent, &fname->cf_name, - de->name, de->name_len, true); + /* + * Just checking IS_ENCRYPTED(parent) below is not + * sufficient to decide whether one can use the hash for + * skipping the string comparison, because the key might + * have been added right after + * ext4_fname_setup_ci_filename(). In this case, a hash + * mismatch will be a false negative. Therefore, make + * sure cf_name was properly initialized before + * considering the calculated hash. + */ + if (IS_ENCRYPTED(parent) && fname->cf_name.name && + (fname->hinfo.hash != EXT4_DIRENT_HASH(de) || + fname->hinfo.minor_hash != EXT4_DIRENT_MINOR_HASH(de))) + return false; + + ret = generic_ci_match(parent, 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. + */ + return false; } - return !ext4_ci_compare(parent, fname->usr_fname, de->name, - de->name_len, false); + return ret; } #endif -- 2.34.1