Received: by 2002:a89:2c3:0:b0:1ed:23cc:44d1 with SMTP id d3csp303675lqs; Tue, 5 Mar 2024 02:30:18 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCURR2uJ4Z5OpsnlQQIa69vhPfjCK+pAH6+1+5NZSRg0OUFldyHwfPK8PUum3hoanJSP5R7t7c2F6Oh6WgOVxUmUQrXAKajgXITm46Y3Sw== X-Google-Smtp-Source: AGHT+IEqrVYTGClf2KoN9TRsgzktaUbnpAU+yZGa1j9HJNcW3Oo9HdVPsuHRqwkpZxbquJy0TKV6 X-Received: by 2002:a17:906:b7c7:b0:a43:9fb0:bb4d with SMTP id fy7-20020a170906b7c700b00a439fb0bb4dmr7479881ejb.63.1709634618570; Tue, 05 Mar 2024 02:30:18 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709634618; cv=pass; d=google.com; s=arc-20160816; b=F5a7mkOUyaTl75DI8IEpej/serUgr+9FZBz3BPjxpufo8w+lzyvOCnpjO3xvEuOR3x 46tD4VsLUEej3PVYTHcf1FULVR7LE/x9zdipoCxoSXiOnSfh9GSMBz7ZSaweTMS/bTY5 RUyt0KJTiMU1zhGQSHPCzqDS0KXdpCpQYYs9bVQweVmysa2FVrTYfSFvnzynPZWi5d7Q /Azg8rjRe/A9HAUxJhneh4hG3v0dJ2QGP5+cVVxBm2p7tuauhwfABaXpMlRDsOgAahUl 144UVZ2G/x9s2DSe69SqdZXDyLr94+GN66rVgF9rEOS/RzIHE/3cNw7pYLfTw2dYLnHA o6cg== 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=Vc7fqOC7SkJfepNzo44OucZ7wbHiHZxidGx82bq3P88=; fh=zf0NNkRrVzzNLxoWnmq9qpFBuYVKEQmjRPQIjT6JsCY=; b=jR88AiB9k2fNJlPhoqiMq3xWqM9F0hItsomFSD+XX4g+BwrnO/hRxvGe7R03vak6Zy 7Qx1pQblMCucWjceCIBPwdpGhaIksXFABxWv9J0uBH4xAHG8ukAmBSALqJAdPqSLA8GM cz5lYV08kusoOiFFr/OU0SLNbFrEkNFrxQcSqxgzMInoUcdQjZO9k3Mu9yoYBx54qwx6 wrD9E5CafXTFXDo8uFQGr4Hi8CXopJ1o/fxNf8bOk2yn4tiB3ekvfRpqxtntNLtjEtOm Yho6ECaUM48EUPmbXIKlOK8TTO4xvCydYCokCJXmRySa7V6Cd3drvEwh6wKqunMn8gBe Sy4Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=A3K8Kd4M; 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-1512-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-ext4+bounces-1512-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id i7-20020a170906a28700b00a442766a5b1si4785006ejz.607.2024.03.05.02.30.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 02:30:18 -0800 (PST) Received-SPF: pass (google.com: domain of linux-ext4+bounces-1512-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=A3K8Kd4M; 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-1512-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-ext4+bounces-1512-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 25C2F1F23429 for ; Tue, 5 Mar 2024 10:30:18 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 0F8E466B56; Tue, 5 Mar 2024 10:16:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="A3K8Kd4M" 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 CD78D65BCA; Tue, 5 Mar 2024 10:16:39 +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=1709633801; cv=none; b=CMKx2yOgilxSKsv3hKm+AyV934PenfL25DyZGlvE9fg6gYUs+YxYgXo3ax7MKxw+UiSYZzLuUtrHWuts+FUYE0tsQBWXmIeeVxov3ZR2bazvchmOCMFvmAy8QEVMsUzeo77WPlbaB0GYjvdsyBvx1pP7zibY6pW/6AhB911OV8Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709633801; c=relaxed/simple; bh=swtZ6BKu+FGmiqRjglGL90hSAB3JlB+upSuAXL/TJpA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SV+sFI6A0cyUJnFIZ2fd1ePSBCrKcY8LZ1lmQHu3VGuM/32sl6GrgbWxqbqE90v84H07Wsph5PkjpYw3RdAkwI0D9/Ej673Dc2FUoErrnL84e31J/J0oqqYy4ho8S01rSgrjXU3FUPspcoU0kbw2tiXrFBHux+uYdN+SmtleZ0w= 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=A3K8Kd4M; 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=1709633798; bh=swtZ6BKu+FGmiqRjglGL90hSAB3JlB+upSuAXL/TJpA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A3K8Kd4MUR+kESOt2ZOyTcjYxg8NXFjhw+zuy422PJh8tSiT9grK27AKeIglzWcXT r1XKNDTQYzxbhcitjOa68E1FK2GSvrkwazl1fcR443LQANJa139VwWMXS37KOc9t7j oYR1k6zCdKGGEzGvLBbEoXccD8rVIiihlR49yv4qvmjAi/phchW2x2fDQsRHoRJn6e PhEZdxA1m60keI1Yc9iFhCPeTg/+b67xicFvBsYOqpkAtWCepYBx24FaBwFVewxn47 L4vXAp5GVmrSQpjViM6WNouMz3UYNxpM2kqnKR5LPwVvkKSXbp5p+BRrcrqXicYAGi jN0Zyum3pqwQw== Received: from eugen-station.domain.com (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 5A96C37820DE; Tue, 5 Mar 2024 10:16:35 +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 v13 4/9] ext4: Reuse generic_ci_match for ci comparisons Date: Tue, 5 Mar 2024 12:16:03 +0200 Message-Id: <20240305101608.67943-5-eugen.hristev@collabora.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240305101608.67943-1-eugen.hristev@collabora.com> References: <20240305101608.67943-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 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 b96983a4c185..2d0ee232fbe7 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 -- 2.34.1