Received: by 2002:a05:7412:1e0b:b0:fc:a2b0:25d7 with SMTP id kr11csp236321rdb; Wed, 14 Feb 2024 20:28:28 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU3rCNpRcRb1kbYblYPgqRh2Fmhq1QL9qM9jBdn2iyPIIRxL2Wby1YSTgEpRjExe2NvT0MliQ/fmWdR6kck67f8d1lrJ8vugB0ocqQpeg== X-Google-Smtp-Source: AGHT+IGvr+3zwgA2ot1Ka/HkYZvQrTpMWAfr9qDP3vOvjXRajLzmhmjgyw/Re7hzmfBIx0bPNzNA X-Received: by 2002:a17:902:ce92:b0:1d7:147d:6a1d with SMTP id f18-20020a170902ce9200b001d7147d6a1dmr759308plg.55.1707971308684; Wed, 14 Feb 2024 20:28:28 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707971308; cv=pass; d=google.com; s=arc-20160816; b=NA8GmZ17Z3voGE4uNkX6mGv82eyScF+qxGwTWayjx36gbPIC2goP4Vg4H4qYfB4PFn RBkayngKQ/kfGnvqTW2Td6QXgpJuEL4T0AX0JCkZyjtgCEJavyE3BiF6a7DQF2F7R4WC 5KN4eocHZv/4gCotyyZWI4bxcF/lAKPY/jsCn3aojb/1j2PdeDkCMronJvN5PLWBuXTA l2Dm34RvA3pCw6O8KVPVk+AhhZkyBIAr5OyQc9YHsWucDQRgeCVXmgrnX55t5E8xNW7B JD2aBPdd46Mmp5VqfKXTZuDO3CAy9k1dYnXkb4CcV/pXOPCKHbH5qjSgZgOEVGye4AVW hjUQ== 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=Cy7z8H89MBnBLftUZQrp7nu413Jc4ar7/bv2lhOC8fs=; fh=zf0NNkRrVzzNLxoWnmq9qpFBuYVKEQmjRPQIjT6JsCY=; b=RWgk0bsNHXAasbj3RaVa+yOY0PxJ6Q/QA7ota97b+XC/xDQWy4DwpIK6UXQQuuAO52 ToD116pKaVq9OTuymWwEfP/q5GtJ+qSiK31+tdGDTrNpEy9gWOUXVcNoxI5txqP1Q2O+ AI46uNKSoNNa3M+BQ5W6P+t0wnJn/GHwMyHH3yzM7psdhGEfoiGXlhHcsDHQzLfIpuWs R+ETFqbCJHMySTzaJHdiArm+/FHXm/wnvfDhZPriY9nntjdI2JJsAM4CIXbCZm4Iu1BM 7qh6/nZZQW6OSlXnOPfQWF11h45JHG0bQfEyX8l9Qsuct/Vpb3efXtV280HMHh/r7TAn oA2w==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=tMJWb7BM; 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-ext4+bounces-1240-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-ext4+bounces-1240-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id m16-20020a170902db1000b001da2c0201besi453664plx.139.2024.02.14.20.28.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Feb 2024 20:28:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-ext4+bounces-1240-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=tMJWb7BM; 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-ext4+bounces-1240-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-ext4+bounces-1240-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 59E61290CFE for ; Thu, 15 Feb 2024 04:28:28 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 059C0B67D; Thu, 15 Feb 2024 04:27:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="tMJWb7BM" X-Original-To: linux-ext4@vger.kernel.org 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 E4E8E134A0; Thu, 15 Feb 2024 04:27:29 +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=1707971251; cv=none; b=O2vFfxa11yE+C/4vzARzP8H8hzL5rOyUhYB7hAvPy7udBTmYY0K9hd4sCC93sxQhVRaS8qWgw06MiczsnkiXGZiHu4vpdXxtMihOttkQL3gFiwM7i389s44yS78Kqvn5/1eNlw56QIzrG6qQTyXA3uVt0ZsywWU+2Qh0uvEdPC4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707971251; c=relaxed/simple; bh=r5QM4nGPXD+IG/Bct8X4+GkfjZyg/HCZtSD4LIsBnEc=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=JuXzp/Gl0qtyN0UfClCDgKJuFCk+FJGa4ZiBQstiYV2+reBq743uQjoKZnkiT656CX4JNMFkBza/GRF/GIbzAjIq7ESZPVK8YZaW352qB2z0MX/KrBe8IZmyZmwsiXW4d2IIpob6LY5RhSohYVcmep/eG44kB7EmlZuUAjYiNrg= 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=tMJWb7BM; 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=1707971248; bh=r5QM4nGPXD+IG/Bct8X4+GkfjZyg/HCZtSD4LIsBnEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tMJWb7BMFdao+VV4nV9uZIBpFJ5phgAwsjo6d7Y6Ujgyw9ncKgrK5+Elp7PfNCZJT +vyg6DbjswL3ftJKtxcmiFaEG/S3TgvAyqX0tl2oY4SgjYa6WY+kdqgJkDyubv+Ns2 J7qjICakRpCVQ8zo5D2AHp7X5gftjEUNaVwtvLne3mBza5bi4eXJSJxE1cOdHUc/l5 SVVQ2edV72fT4N0yzkuGcva7B/UGf+Ud+HNqut1dqpb3V2mETmaSg5HSovzphhBDIk vZFr5w01A3haM29wPsPL1XruqbwZ5hOJOLIEZaxN4m9bkhDPXMPPRVYCqVvamw65CU x8pY1wVJrweVQ== 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 891BE378208E; Thu, 15 Feb 2024 04:27:23 +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 v10 3/8] libfs: Introduce case-insensitive string comparison helper Date: Thu, 15 Feb 2024 06:26:49 +0200 Message-Id: <20240215042654.359210-4-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240215042654.359210-1-eugen.hristev@collabora.com> References: <20240215042654.359210-1-eugen.hristev@collabora.com> Precedence: bulk X-Mailing-List: linux-ext4@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 | 80 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 4 +++ 2 files changed, 84 insertions(+) diff --git a/fs/libfs.c b/fs/libfs.c index bb18884ff20e..82871fa1b066 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -1773,6 +1773,86 @@ static const struct dentry_operations generic_ci_dentry_ops = { .d_hash = generic_ci_d_hash, .d_compare = generic_ci_d_compare, }; + +/** + * 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; + + 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. + * + * This comparison is safe under RCU because the caller + * guarantees the consistency between str and len. See + * __d_lookup_rcu_op_compare() for details. + */ + if (folded_name->name) { + if (dirent.len == folded_name->len && + !memcmp(folded_name->name, dirent.name, dirent.len)) { + res = 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))) { + res = 1; + goto out; + } + res = !utf8_strncasecmp(um, name, &dirent); + } + +out: + kfree(decrypted_name.name); + return res; +} +EXPORT_SYMBOL(generic_ci_match); #endif #ifdef CONFIG_FS_ENCRYPTION diff --git a/include/linux/fs.h b/include/linux/fs.h index 820b93b2917f..7af691ff8d44 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3296,6 +3296,10 @@ extern int generic_file_fsync(struct file *, loff_t, loff_t, int); extern int generic_check_addressable(unsigned, u64); extern void generic_set_encrypted_ci_d_ops(struct dentry *dentry); +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