Received: by 2002:ab2:620c:0:b0:1ef:ffd0:ce49 with SMTP id o12csp1374823lqt; Wed, 20 Mar 2024 01:47:58 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCW2//2DdujfxQPY/qrplLjwMNq8+cW/U4nAmIpEwCAacQwXgyjGd65lIWn3gogEqasjSt9Rw80dgrHSyA4QxUnuyAZIx7s2jBZSaLw+ew== X-Google-Smtp-Source: AGHT+IFRQcMujqamiiKPpig7JVOs4soMixfXbKcxr+WBnYEtMhVlMNbgAh19sumkQX6i72JM5db9 X-Received: by 2002:ac8:4dce:0:b0:430:d95c:612d with SMTP id g14-20020ac84dce000000b00430d95c612dmr8348387qtw.13.1710924478019; Wed, 20 Mar 2024 01:47:58 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1710924478; cv=pass; d=google.com; s=arc-20160816; b=nHQfQjXGWrAe+dt4epOZVf3MtQxXl7GMKcZbZnyxWnVYqBeobUFkagCLuKo/IX6NxB lD6aqlhrBZ/sJHId2f8lzce6c3ZXIzSyJHic97FaaTt0L+97r5Pi3UyNAZvQosCfdUjz uirKt95Tu2SxqRWIRHmVdxiv1DITJcSelpkSZhFIyZH1HnTmIUPKaxTiQaM8bn8aNAAG nqwcdSxsVr3AGxQ6yQIEjSyx+x9gX3Syiqd2QbIDI3NOmzEQV1rzqooVU7mTX/sI3W2R 0P4U1Bz4qS2mWjmEiUTLK7wGb6qrpyxIPu0845fxGVCyC+pIbv9VpZfRG1KGjoY+7jOf 6jpQ== 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=AKwvK/HS9IUopAhw/EmLrvhjDdrXgu3eEQUUYuZDCwo=; fh=zf0NNkRrVzzNLxoWnmq9qpFBuYVKEQmjRPQIjT6JsCY=; b=G0tSUk1+TzBULt0K6rK5N/HN87VcLExxTlzqy4iqRJiOWQ6B/fItlDYG7CASAggjx+ CQxzppG/OakYgPduD82hofluGK/LRTLDJ/ESJZak6gB+4WPBs3w9o1AIeAR2h+9p39ae RMPJ9wG8RWvCDbXgst7sHRyZIbxVKWAcueALADhqLfQQtkBCQH6+1bJtuO2UEM2p9dUf lA2Poxg0/GGflEuJlGoR2Q+m3EiIftVzSzLtGUs1AicDAPNEhLUuuVE6nf7urHc3tglF 3CtVJktZAM8fC3olGbWxkIbDHIfE8orXXxhF4VmiEU0h13hElFXwzysWbqISB7kUAeL/ Qqvw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=YpZDw3q0; 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-108635-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-108635-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id y20-20020a05622a005400b0043103d57ef6si947504qtw.703.2024.03.20.01.47.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Mar 2024 01:47:58 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-108635-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=YpZDw3q0; 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-108635-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-108635-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id BBF981C211D5 for ; Wed, 20 Mar 2024 08:47:57 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4E85C3D54B; Wed, 20 Mar 2024 08:46:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="YpZDw3q0" 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 BE1823C478; Wed, 20 Mar 2024 08:46:40 +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=1710924402; cv=none; b=eI5qeScySf6Y/vveT/YrLNFQPfY47Fuqa76bZ6pWlAJiL0DCHPwGp6vG1h2co3x9p9lbaLprT7M0l1b/B7pwy7QFlMdd6abKdXLRnl+C8V2N//9klPDE7mz08OTlhALbdhL4QBu/2s6JssbqNFZSLLN5BhIdvlKVP1YCbWp9yBc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1710924402; c=relaxed/simple; bh=upTn9VDPH4ATj696dO2v0HAAxcgXeQncdfgIxpTDi8A=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=OIVfclPp0u0pBGWCdBAU+kDIJ1Kbi5N1pB/27dXOikc5O50Fu22X28R52s0lhMmjfmz+xYQB67ksydYP8DpZ3nZy8eO+DMSFfz9TaJcMbBVIEqFjMCUGFBXXN1sdcVLwJDLkXIDdOmFbeFRS2nBVFLXj7RwH0ayvXCicl4AWyAU= 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=YpZDw3q0; 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=1710924399; bh=upTn9VDPH4ATj696dO2v0HAAxcgXeQncdfgIxpTDi8A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YpZDw3q0AHiyQxFxxxMOsYIEu8hpNzrcUOaLhtnYdCnBBfYVOvA6OV9ibmNLIVtZu R4n3tihSPplRzkMbNlfSontLgp4QYbciXCy7VS+q05+/VjX4DeDTzp4nKklAy3TT/g XfCPn6SAyMlWnNjYf1j2xtlenI4am+/A3YNawid4++6JzTgfe4/8ivQj1wXp5xSN8+ YNahRfjAtYaPUxf24TmD6fOIdDgI+/GbvSAp4d8s5QdvZjwvO4x9JdQkUikjpRWNpA zKpczlMRu09COAVX/Yp103lnxoLP1cwKH1V7315vsD6g+4uneaUMrw0Hhr/XT3Y2AR aiOsIoDhlsnMQ== 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 925F737820EE; Wed, 20 Mar 2024 08:46:36 +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 v14 3/9] libfs: Introduce case-insensitive string comparison helper Date: Wed, 20 Mar 2024 10:46:16 +0200 Message-Id: <20240320084622.46643-4-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> 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 generic_ci_match can be used by case-insensitive filesystems to compare strings under lookup with dirents in a case-insensitive way. This function is currently reimplemented by each filesystem supporting casefolding, so this reduces code duplication in filesystem-specific code. Signed-off-by: Gabriel Krisman Bertazi [eugen.hristev@collabora.com: rework to first test the exact match] Signed-off-by: Eugen Hristev --- fs/libfs.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 4 +++ 2 files changed, 81 insertions(+) diff --git a/fs/libfs.c b/fs/libfs.c index c297953db948..711eecc125bd 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -1776,6 +1776,83 @@ static const struct dentry_operations generic_ci_dentry_ops = { .d_revalidate = fscrypt_d_revalidate, #endif }; + +/** + * generic_ci_match() - Match a name (case-insensitively) with a dirent. + * This is a filesystem helper for comparison with directory entries. + * generic_ci_d_compare should be used in VFS' ->d_compare instead. + * + * @parent: Inode of the parent of the dirent under comparison + * @name: name under lookup. + * @folded_name: Optional pre-folded name under lookup + * @de_name: Dirent name. + * @de_name_len: dirent name length. + * + * Test whether a case-insensitive directory entry matches the filename + * being searched. If @folded_name is provided, it is used instead of + * recalculating the casefold of @name. + * + * Return: > 0 if the directory entry matches, 0 if it doesn't match, or + * < 0 on error. + */ +int generic_ci_match(const struct inode *parent, + const struct qstr *name, + const struct qstr *folded_name, + const u8 *de_name, u32 de_name_len) +{ + 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 dirent = QSTR_INIT(de_name, de_name_len); + int res = 0, match = 0; + + if (IS_ENCRYPTED(parent)) { + const struct fscrypt_str encrypted_name = + FSTR_INIT((u8 *) de_name, de_name_len); + + if (WARN_ON_ONCE(!fscrypt_has_encryption_key(parent))) + return -EINVAL; + + decrypted_name.name = kmalloc(de_name_len, GFP_KERNEL); + if (!decrypted_name.name) + return -ENOMEM; + res = fscrypt_fname_disk_to_usr(parent, 0, 0, &encrypted_name, + &decrypted_name); + if (res < 0) + goto out; + dirent.name = decrypted_name.name; + dirent.len = decrypted_name.len; + } + + /* + * Attempt a case-sensitive match first. It is cheaper and + * should cover most lookups, including all the sane + * applications that expect a case-sensitive filesystem. + */ + if (folded_name->name) { + if (dirent.len == folded_name->len && + !memcmp(folded_name->name, dirent.name, dirent.len)) { + match = 1; + goto out; + } + res = utf8_strncasecmp_folded(um, folded_name, &dirent); + } else { + if (dirent.len == name->len && + !memcmp(name->name, dirent.name, dirent.len) && + (!sb_has_strict_encoding(sb) || !utf8_validate(um, name))) { + match = 1; + goto out; + } + res = utf8_strncasecmp(um, name, &dirent); + } + +out: + kfree(decrypted_name.name); + if (res < 0) + return res; + return (match || !res); +} +EXPORT_SYMBOL(generic_ci_match); #endif #ifdef CONFIG_FS_ENCRYPTION diff --git a/include/linux/fs.h b/include/linux/fs.h index ff1338109b54..690b37e1db95 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3281,6 +3281,10 @@ extern int generic_file_fsync(struct file *, loff_t, loff_t, int); extern int generic_check_addressable(unsigned, u64); extern void generic_set_sb_d_ops(struct super_block *sb); +extern int generic_ci_match(const struct inode *parent, + const struct qstr *name, + const struct qstr *folded_name, + const u8 *de_name, u32 de_name_len); static inline bool sb_has_encoding(const struct super_block *sb) { -- 2.34.1