From patchwork Wed May 11 19:31:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gabriel Krisman Bertazi X-Patchwork-Id: 1629713 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.a=rsa-sha256 header.s=mail header.b=XT7pcUCR; dkim-atps=neutral Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Kz4mm27zRz9sFk for ; Thu, 12 May 2022 05:32:24 +1000 (AEST) Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4Kz4mm1RZZz4ySc for ; Thu, 12 May 2022 05:32:24 +1000 (AEST) Received: by gandalf.ozlabs.org (Postfix) id 4Kz4mm1Nhrz4ySd; Thu, 12 May 2022 05:32:24 +1000 (AEST) Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: gandalf.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=2620:137:e000::1:20; helo=out1.vger.email; envelope-from=linux-ext4-owner@vger.kernel.org; receiver=) Authentication-Results: gandalf.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=collabora.com header.i=@collabora.com header.a=rsa-sha256 header.s=mail header.b=XT7pcUCR; dkim-atps=neutral Received: from out1.vger.email (out1.vger.email [IPv6:2620:137:e000::1:20]) by gandalf.ozlabs.org (Postfix) with ESMTP id 4Kz4mm1KLSz4ySc for ; Thu, 12 May 2022 05:32:24 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346941AbiEKTcX (ORCPT ); Wed, 11 May 2022 15:32:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38434 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346890AbiEKTcV (ORCPT ); Wed, 11 May 2022 15:32:21 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF81AFFA90 for ; Wed, 11 May 2022 12:32:19 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: krisman) with ESMTPSA id 987211F42944 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1652297538; bh=a8sssBLcQvf+HLVmuG0sfdDXgG2gwA/kjMiWWYhyeDU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XT7pcUCRsxugFY70TnhWWnubU/Gk8u5OmmS6OssMjrnCnRKt0tj2N21ZcNbThqhTi huHpB1/7v+HMlQS2EU7ajCnBTujYUQ/IojystIxAc24k9VSq3QskL8XWKoTivQnIfy t0ISjsWB3hFkONUOH/oqViGWwn2q1KwRHWt0Yg7DeJgNDD7GnpZSZlIt7URtTpC41b y7ccVSrneN6lyWLFF4Zg6OW9WPqi9rs8yLMWRqMZBptBAfcYRVO5NHi7lqDAmnRgCN 9BIVj320fXgFT1mPgkeRHQVk/+bdGp5AccsSFDmVN45camk+6noHB/5+/cwezqbg4s LVma1dwuOUoYw== From: Gabriel Krisman Bertazi To: tytso@mit.edu, adilger.kernel@dilger.ca, jaegeuk@kernel.org Cc: linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, ebiggers@kernel.org, Gabriel Krisman Bertazi , kernel@collabora.com Subject: [PATCH v4 07/10] ext4: Move ext4_match_ci into libfs Date: Wed, 11 May 2022 15:31:43 -0400 Message-Id: <20220511193146.27526-8-krisman@collabora.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220511193146.27526-1-krisman@collabora.com> References: <20220511193146.27526-1-krisman@collabora.com> MIME-Version: 1.0 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,URIBL_BLOCKED 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 Matching case-insensitive names is a generic operation and can be shared with f2fs. Move it next to the rest of the shared casefold fs code. Signed-off-by: Gabriel Krisman Bertazi --- fs/ext4/namei.c | 62 +--------------------------------------------- fs/libfs.c | 61 +++++++++++++++++++++++++++++++++++++++++++++ include/linux/fs.h | 3 +++ 3 files changed, 65 insertions(+), 61 deletions(-) diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 708811525411..16fd0df5f8a8 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c @@ -1318,66 +1318,6 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block) } #if IS_ENABLED(CONFIG_UNICODE) -/** - * ext4_match_ci() - Match (case-insensitive) a name with a dirent. - * @parent: Inode of the parent of the dentry. - * @uname: 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. - * - * Return: > 0 if the directory entry matches, 0 if it doesn't match, or - * < 0 on error. - */ -static int ext4_match_ci(const struct inode *parent, - const struct unicode_name *uname, - u8 *de_name, size_t 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 entry = QSTR_INIT(de_name, de_name_len); - int ret, match = false; - - 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 (uname->folded_name->name) - ret = utf8_strncasecmp_folded(um, uname->folded_name, &entry); - else - ret = utf8_strncasecmp(um, uname->usr_name, &entry); - - if (!ret) - match = true; - else if (ret < 0 && !sb_has_strict_encoding(sb)) { - /* - * In non-strict mode, fallback to a byte comparison if - * the names have invalid characters. - */ - ret = 0; - match = ((uname->usr_name->len == entry.len) && - !memcmp(uname->usr_name->name, entry.name, entry.len)); - } - -out: - kfree(decrypted_name.name); - return (ret >= 0) ? match : ret; -} - int ext4_fname_setup_ci_filename(struct inode *dir, const struct qstr *iname, struct ext4_filename *name) { @@ -1451,7 +1391,7 @@ static bool ext4_match(struct inode *parent, }; int ret; - ret = ext4_match_ci(parent, &u, de->name, de->name_len); + ret = generic_ci_match(parent, &u, de->name, de->name_len); if (ret < 0) { /* * Treat comparison errors as not a match. The diff --git a/fs/libfs.c b/fs/libfs.c index 974125270a42..c14b3fa615f5 100644 --- a/fs/libfs.c +++ b/fs/libfs.c @@ -1465,6 +1465,67 @@ 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 (case-insensitive) a name with a dirent. + * @parent: Inode of the parent of the dentry. + * @uname: 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. + * + * 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 unicode_name *uname, + u8 *de_name, size_t 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 entry = QSTR_INIT(de_name, de_name_len); + int ret, match = false; + + 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 (uname->folded_name->name) + ret = utf8_strncasecmp_folded(um, uname->folded_name, &entry); + else + ret = utf8_strncasecmp(um, uname->usr_name, &entry); + + if (!ret) + match = true; + else if (ret < 0 && !sb_has_strict_encoding(sb)) { + /* + * In non-strict mode, fallback to a byte comparison if + * the names have invalid characters. + */ + ret = 0; + match = ((uname->usr_name->len == entry.len) && + !memcmp(uname->usr_name->name, entry.name, entry.len)); + } + +out: + kfree(decrypted_name.name); + return (ret >= 0) ? match : ret; +} +EXPORT_SYMBOL(generic_ci_match); #endif #ifdef CONFIG_FS_ENCRYPTION diff --git a/include/linux/fs.h b/include/linux/fs.h index 3f76a18a5f40..6a750b8704c9 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -3364,6 +3364,9 @@ struct unicode_name { }; extern void generic_set_encrypted_ci_d_ops(struct dentry *dentry); +extern int generic_ci_match(const struct inode *parent, + const struct unicode_name *uname, u8 *de_name, + size_t de_name_len); #ifdef CONFIG_MIGRATION extern int buffer_migrate_page(struct address_space *,