Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1784413iob; Thu, 19 May 2022 14:42:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwCXpNI/UXUvpnx/QgpKcTnll7iUYLjxtlXD4flFWPlD6eDZwlubQRj7lBARYNImHmz14ih X-Received: by 2002:a05:6402:4392:b0:42b:612:b275 with SMTP id o18-20020a056402439200b0042b0612b275mr4524140edc.288.1652996530491; Thu, 19 May 2022 14:42:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652996530; cv=none; d=google.com; s=arc-20160816; b=pKryXigDYlPu9Jc4CyErhZEvPdjn3X2BDy4aB1IKuvYexCRHdi16QmwLcZ8Fp/K+/Q 0TTNiyS0iEIVejvGv+SuyiG0xxZ6Xc3UQCBpQ13mUddZivSaEhIulje2MBxLdhu9f2Fb e2QMOG3MfFuV4LaRV9uYo+rTfTnDLjoW+OGIoFMYuH90PtMqxfueemqEpkjwiQEV6Zjo GEhH82Kz/zEugp340qtejLvkeR7rpcz7m6FiLleX6gYAKuKIlhME2+cEtt3W6anywmaz N5AzhMxAJ5NXi83sa5V2HJc3OcYUYfV9cXeAh5hXJgv7PLpHdtfwRM51nDRDscv9pe3E IqiA== 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=JwBRujFCrvhEr0m+QCqDT7QAWT9ghEEbK544DO4Gw8Y=; b=KFs4wh/gRD6XoVPsWKylF26KH/tyArdmUbPs4Yl4b8xD4itJ/92s/tp9rVPQ6yaW2C ZjkhDd+hI8TKUnHpYs4yrWRUh2wvVc937uEnSKgbnBgnzZPGt7f2YpZtnWrRL9RpitbK va64vCFcNXcOzUDS1x4RTi54zf6kGAvbqcNEpO83mFbO6aUSYhKNwzh8okx5zi36/lXT 7oteS6i0hqZOiDs6w5tqQ0MJI/Id7tQLig1gN+MH80F8HwWpySVhBpxUEwK7R44SHclQ 9vaGLwl2blTnZODnDtvPGeeW++CStWORwV4f79I187lxAMe8ZH1q78IV2h+YCnFbw77u l+wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=L7pvKsAd; 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 g14-20020a1709065d0e00b006f46b703348si6069938ejt.481.2022.05.19.14.41.45; Thu, 19 May 2022 14:42:10 -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=L7pvKsAd; 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 S244802AbiESUrG (ORCPT + 99 others); Thu, 19 May 2022 16:47:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47626 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S244788AbiESUrD (ORCPT ); Thu, 19 May 2022 16:47:03 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DA519326FB for ; Thu, 19 May 2022 13:47:01 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id 85D151F4541F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652993220; bh=Yy1A6Vts7piejGKGGyulGEO3LNJA5px4YK35G29ueMA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L7pvKsAddjXO2/q7c/0Cwsx2EHKVeP4DPPC1rL+sHARFbYA5b+xxOQ3aKSkwPJvOg ln/N5rK9ZOkOqMLZjbfmacv13/GyP8Cq67KKf9HfrbpDzs98X1HANgWT8rnsMh3esi c4d8DOGRWhiYvc39SJCaL7Hde5fexWPsrTZvybhkT6wwMCU9yVQaP034uhQksm/m0k Wwq/2KfDQ2lrszHVPnN1UVpR8UIiE+FIwKxR02pI/RgeMZuz9Yf8x4FI/ozFVL78El JrM7WZTueDnsWDnASDONYfIcbDl+m9eZES/vWV7+AstBEL0B9b58M/SIwkotSjGrTu yipWUBABSjEzA== 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 3/8] libfs: Introduce case-insensitive string comparison helper Date: Thu, 19 May 2022 16:46:40 -0400 Message-Id: <20220519204645.16528-4-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 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. Reviewed-by: Eric Biggers Signed-off-by: Gabriel Krisman Bertazi --- Changes since v5: (eric) - Rename variable err -> res - Retype de_name_len from size_t to u32 - Bring WARN_ON_ONCE(!fscrypt_has_encryption_key) from f2fs implementation --- fs/libfs.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 4 +++ 2 files changed, 72 insertions(+) diff --git a/fs/libfs.c b/fs/libfs.c index 974125270a42..f1d88cd903f8 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -1465,6 +1465,74 @@ 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. + * @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, match = false; + + 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; + } + + if (folded_name->name) + res = utf8_strncasecmp_folded(um, folded_name, &dirent); + else + res = utf8_strncasecmp(um, name, &dirent); + + if (!res) + match = true; + else if (res < 0 && !sb_has_strict_encoding(sb)) { + /* + * In non-strict mode, fallback to a byte comparison if + * the names have invalid characters. + */ + res = 0; + match = ((name->len == dirent.len) && + !memcmp(name->name, dirent.name, dirent.len)); + } + +out: + kfree(decrypted_name.name); + return (res >= 0) ? 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 e2d892b201b0..4c2b781f667a 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3359,6 +3359,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); #ifdef CONFIG_MIGRATION extern int buffer_migrate_page(struct address_space *, -- 2.36.1