From patchwork Mon Feb 19 07:44:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eugen Hristev X-Patchwork-Id: 202926 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp1135343dyc; Sun, 18 Feb 2024 23:50:22 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUg6Wa9CFP5lisbTQMHNVVu+c55qts245a4S+uat+lniRCIzM5Fj8TtleL0IKTuJBoEHm52J5/B+BNFWKoJHWnwsiFRXw== X-Google-Smtp-Source: AGHT+IHBCwk13fr3ZgxKA/ewiIVtgmJPwWAGT7nEG0HaTay4PuSOY5uiUX+ELmrg6ET1BKvGt0Oe X-Received: by 2002:a05:6358:8aa:b0:176:5c73:393b with SMTP id m42-20020a05635808aa00b001765c73393bmr13596498rwj.18.1708329021808; Sun, 18 Feb 2024 23:50:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708329021; cv=pass; d=google.com; s=arc-20160816; b=xoux76Va0VqlCGt+Cwp0YBIoLXXmu3dzb0sR/KolSY6xVRtFHmjnKYJfOHsihcnkLc lODtdki3gyN64g+f1eDpKmR17okemVTyYb7oY3LwDx4tLOTmzgk3k5Plf73FfTSfw7Zl hFHbLydJdkuCCL1CMQ0OygJwGvGvSjIFV5YRgX1K40K4lQMRiig8bCggFaTUkcobi7Ba Z+zuXpeuXgqTGQWc/A39DAorFiF1ORjn7jRBcy8xoFwrIX6xPtjnyIcz60veLSaToiiy +CTstolDjY9DMlMbLPFgpfwutlQ6GTjwWFv14sJNsoDtWT47KOz0E9LWYyUFhS1xhyA4 F0wg== 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=PdiaO3VIWvQuMxWuMa6cg0G1rkiFb6qwTOaMIme/UvpEl0SCO4Wza6JM+bfp3TILzw PoiC5F5yvCkjjB+DrvoSCHozUqpljsBLoQuZSzCNOKVvlagvd/MCQweKXFvnWP6EqQQu fRSCxBQ5dYKhsCH7t5K/I3D0o8wVMbKz+noBmSxcOFgSNFXXs2qLmGnmIJsffRSLrXfZ AHEuw7BaooCJjEFlMvRQWMkYth7/6VUNun6Glum2X01F1LgTf48+fVoGKrAp80zWfMSj m7JW+m62zsDWwxg6D8SVqxxPcNPE+24D8+Bz8yUEHyhnu5+AWMj0Bi80yBkmaWrwhGpH /+Gw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="p3lhT/jv"; 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-70855-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70855-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id o30-20020a63731e000000b005c625d44bd5si4120594pgc.281.2024.02.18.23.50.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Feb 2024 23:50:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-70855-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b="p3lhT/jv"; 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-70855-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-70855-ouuuleilei=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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 3D8EAB22C13 for ; Mon, 19 Feb 2024 07:47:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1377B249FA; Mon, 19 Feb 2024 07:45:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="p3lhT/jv" 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 B6E6B23766; Mon, 19 Feb 2024 07:45:28 +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=1708328730; cv=none; b=Un4inuVvqo+GZVUtihDQkgozBKp8z8yo9D8aiqpmucw2x1LWUpBXqfFalxGW67tQmniMBLUQNx34sHCe5D7z0xPCeohSFwbVvLt8EzEvDJJpuZcYrS8NRKU55uCOi6BgMsaVQ+S1AACUubiPjjAKI9hI5sMopOfk30T7TrHaujw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708328730; c=relaxed/simple; bh=Hp90mLjR44WCv/VB4t8dflfSiAXrxxn0/qF/zsP/e4I=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=TRWf9eEgeT7TOHFppHj1jHwwlMZmufcZ0PmpTk7ypg3ARtMMhrqURmjQSvVQVtxZnn0qIiaqM3EmBVqYaN3MEL761+22koKZKsb5Tnpy0adw2ZnbI++2vhNl2Bv2TVMKrs8RdNAiHftLjUC1WZkbmXACQZFeI2Yymwy67kbxzec= 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=p3lhT/jv; 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=1708328727; bh=Hp90mLjR44WCv/VB4t8dflfSiAXrxxn0/qF/zsP/e4I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p3lhT/jv0A2zR2B4Gk0V5EUW4VuJjvrGYiys8axjHULd66/cqJbcUUU5t1G+Nudks FvDglNYw5opuvy4DAVNN9iwXo03algsvAR2RyuSEhqu3QRb9LXVfyRjNoGZN7I59rn hYMiWrbAVVn9O87LYwdbydudLM47LL9DlvN18AsuwSYSD4eLCL73CRqRjtJxmQ//RH w7oqZgulku9ES3p1BISucO6CYEfXFieM8Ejzz6EKjJQBQUaogzjS471mTsbusI+wiX ZupmKv+HOuVs+LusoZzL3zQPViJvRH5wUkHiSgD/vViIqNR4ydK8EE/CXDtW3uonPn TqtbOcUBpwaHg== 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 21B1A378202B; Mon, 19 Feb 2024 07:45:22 +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 v11 4/8] ext4: Reuse generic_ci_match for ci comparisons Date: Mon, 19 Feb 2024 09:44:53 +0200 Message-Id: <20240219074457.24578-5-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240219074457.24578-1-eugen.hristev@collabora.com> References: <20240219074457.24578-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 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791312812278000773 X-GMAIL-MSGID: 1791312812278000773 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