Received: by 2002:a89:d88:0:b0:1fa:5c73:8e2d with SMTP id eb8csp1510826lqb; Sun, 26 May 2024 04:50:01 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCULcP7YOCEIPTEbAGEPa0v2dF/nKqIJmSrMGn5lmthiHFmiJb5Lm7dix+L7uZIBM3yOCTGoYbyUonLnkZ1QPYkr5Lct/eacc52ETNKrMA== X-Google-Smtp-Source: AGHT+IF91R5XXcXjtFpzVS598nHGEWzkNbeUu8Ikol0MsyVhU9QLdtv203l8I+5LXUSPvCh6y+Sm X-Received: by 2002:a05:620a:2b84:b0:794:9adb:8de3 with SMTP id af79cd13be357-794ab114986mr836096985a.48.1716724201773; Sun, 26 May 2024 04:50:01 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1716724201; cv=pass; d=google.com; s=arc-20160816; b=MlYunU/Dsg9DhfuKRFM/c+ccYRcq8hlcoTRSnKqATJKlq4fmebqbetLBiZ5bC9WqIi YxO6wOibw+KsbowkdfxRbzyOin1d0UJ1WCFZCdAFoGmLrFQO6GnlBNCwhvTsQImRBRLa +1svXREgFnkQoPpA2lfiGEN/GvV21AQuj9aClGfvw5RrV4BGp7mgvrkVPjgVx5qA5XWG DuHkT+9KvkqCKXt1MzkAQGp859Ewr6A3fTXNy3yF6qP+NCa6WRbVLxsj+5bMlFK1H1ZH VwUyB5TizXvJNeTv0B1QR6PzVxfBqkLlyHPBD02NRT4Z7XXjytLFHqDGsv9pu0hlhdwk 4O4g== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:date:message-id:dkim-signature; bh=y/w+h0W0FChp+Vs3G6PbfBSiUejrWAkVDFrncEO5dZI=; fh=JJWKUmFRyboSPuMMP0zbuc3EUislvuhEd+KG2EiIB7A=; b=0mo4GTMur0h1Y15iPHotKH5b9x/2ncVcp39FfQrqzIKsWTPLLYXbqQbfkmxXTWkMPZ 2jHBncJBdZPGna05KngWDrQi7uJtMk3AGuHNGLlX7qWGkTVvwZ8fcJLubLEZGJ74OnKM LltJSd4lrq0qfxVbha5w084qMVjKeEa1cjW6fxgoezlO676+pSB7EmmrbpA974DQNg5p RgIXYiumRNDPy9XJTKK6sjeBmdvpJbvGe7fMdWucVmhaVjsvqivfAkilHUErdNxPU+EV 6y1YFTaA99FfM00MftDpr+wZ1FiaCzF+Xh8CW45hI/wolUGZ023iyoMotqQvkxq4f/Ss mlkQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=PvQfWxwo; 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-2646-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-ext4+bounces-2646-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=collabora.com Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id af79cd13be357-794abcac19csi553289485a.149.2024.05.26.04.50.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 May 2024 04:50:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-ext4+bounces-2646-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=PvQfWxwo; 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-2646-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-ext4+bounces-2646-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 ny.mirrors.kernel.org (Postfix) with ESMTPS id 70DFA1C20A8D for ; Sun, 26 May 2024 11:50:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8A5A6DDD8; Sun, 26 May 2024 11:49:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=collabora.com header.i=@collabora.com header.b="PvQfWxwo" 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 5C909D524; Sun, 26 May 2024 11:49:51 +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=1716724193; cv=none; b=Cc2nKutOia+gnwuO/xmcgTuv9/dquCRGCskbzu+f4zX9Q6Z8ADMXspp+xWg/+mUiN1+w0AP3ym3tMD0wT0uKZWx5hTPQ2+wvxT21aLW5bM0Kft8uRD+j7PShCLVXFklQo47VjLZjGh3rYrVMcgXfCdga0ryw01198nYx8mYZE+M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1716724193; c=relaxed/simple; bh=1S0uRH1NaKnSxVqVxh5XtY1K+ZMfNCChicbaWsjdybQ=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=UQDbkPrivWn9QXS6CVjzMLf0sTKGlWfNquorRiUGK66FssqoXXyEpTA+ev13o5QK0SuQd/B1W/GQK2RvkOBWOZ5JpykMBOw6oyqqNtwRTBqkZHnW/7hzcMaqoLyvujuHVEcyJb4kc2aHFDxj0iwWiJ9jnDD8vwdvFv6qKDimGLc= 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=PvQfWxwo; 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=1716724184; bh=1S0uRH1NaKnSxVqVxh5XtY1K+ZMfNCChicbaWsjdybQ=; h=Date:Subject:To:Cc:References:From:In-Reply-To:From; b=PvQfWxwoCB7XIL21b8WzaTfH0XQ+gByaa24MXwOZukjodY2BWD6OXLZBvnWa805qu /pR5DOVorSNfn1Bey+XyNrWMN5aPl+v3VDKAlXB9MlGIB7GdC+iL5y/wgi3OXRXFz6 qoJku+/A7YM+OzCFAFVlwTzbGU++fen1hal4iSJLDNKe3OfzkBGQbtiGEbEj+59vnI QSXzR6WcA0/z4S6z/tzhqFva7g3G+P/yi+3zfpGdcVF7dVVoVFrGylBh697csYLVqC agw9eJ26k6vAZUz48IejLXyMJXaY99juVMJfTYxnFNibP1XNycSX8NfDkTXibRwjHU VBewwGss/zwRg== Received: from [100.90.194.27] (cola.collaboradmins.com [195.201.22.229]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 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 236B5378000A; Sun, 26 May 2024 11:49:43 +0000 (UTC) Message-ID: <92b56554-3415-46fe-99b4-99258d8a496c@collabora.com> Date: Sun, 26 May 2024 14:49:42 +0300 Precedence: bulk X-Mailing-List: linux-ext4@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v16 3/9] libfs: Introduce case-insensitive string comparison helper To: Gabriel Krisman Bertazi Cc: Eric Biggers , 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, linux-kernel@vger.kernel.org, kernel@collabora.com, viro@zeniv.linux.org.uk, brauner@kernel.org, jack@suse.cz, Gabriel Krisman Bertazi References: <20240405121332.689228-1-eugen.hristev@collabora.com> <20240405121332.689228-4-eugen.hristev@collabora.com> <20240510013330.GI1110919@google.com> <875xviyb3f.fsf@mailhost.krisman.be> <9afebadd-765f-42f3-a80b-366dd749bf48@collabora.com> <87ttipqwfn.fsf@mailhost.krisman.be> Content-Language: en-US From: Eugen Hristev In-Reply-To: <87ttipqwfn.fsf@mailhost.krisman.be> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 5/23/24 02:05, Gabriel Krisman Bertazi wrote: > Eugen Hristev writes: > >> On 5/13/24 00:27, Gabriel Krisman Bertazi wrote: >>> Eric Biggers writes: >>> >>>> On Fri, Apr 05, 2024 at 03:13:26PM +0300, Eugen Hristev wrote: >>> >>>>> + 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; >>>> >>>> If fscrypt_fname_disk_to_usr() returns an error and !sb_has_strict_encoding(sb), >>>> then this function returns 0 (indicating no match) instead of the error code >>>> (indicating an error). Is that the correct behavior? I would think that >>>> strict_encoding should only have an effect on the actual name >>>> comparison. >>> >>> No. we *want* this return code to be propagated back to f2fs. In ext4 it >>> wouldn't matter since the error is not visible outside of ext4_match, >>> but f2fs does the right thing and stops the lookup. >> >> In the previous version which I sent, you told me that the error should be >> propagated only in strict_mode, and if !strict_mode, it should just return no match. >> Originally I did not understand that this should be done only for utf8_strncasecmp >> errors, and not for all the errors. I will change it here to fix that. > > Yes, it depends on which error we are talking about. For ENOMEM and > whatever error fscrypt_fname_disk_to_usr returns, we surely want to send > that back, such that f2fs can handle it (i.e abort the lookup). Unicode > casefolding errors don't need to stop the lookup. > > >>> Thinking about it, there is a second problem with this series. >>> Currently, if we are on strict_mode, f2fs_match_ci_name does not >>> propagate unicode errors back to f2fs. So, once a utf8 invalid sequence >>> is found during lookup, it will be considered not-a-match but the lookup >>> will continue. This allows some lookups to succeed even in a corrupted >>> directory. With this patch, we will abort the lookup on the first >>> error, breaking existing semantics. Note that these are different from >>> memory allocation failure and fscrypt_fname_disk_to_usr. For those, it >>> makes sense to abort. >> >> So , in the case of f2fs , we must not propagate utf8 errors ? It should just >> return no match even in strict mode ? >> If this helper is common for both f2fs and ext4, we have to do the same for ext4 ? >> Or we are no longer able to commonize the code altogether ? > > We can have a common handler. It doesn't matter for Ext4 because it > ignores all errors. Perhaps ext4 can be improved too in a different > patchset. > >>> My suggestion would be to keep the current behavior. Make >>> generic_ci_match only propagate non-unicode related errors back to the >>> filesystem. This means that we need to move the error messages in patch >>> 6 and 7 into this function, so they only trigger when utf8_strncasecmp* >>> itself fails. >>> >> >> So basically unicode errors stop here, and print the error message here in that case. >> Am I understanding it correctly ? > > Yes, that is it. print the error message - only in strict mode - and > return not-a-match. > > Is there any problem with this approach that I'm missing? As the printing is moved here, in the common code, we cannot use either of f2fs_warn nor EXT4_ERROR_INODE . Any suggestion ? Would have to be something meaningful for the user and ratelimited I guess. Thanks for the explanations ! > >>>>> + /* >>>>> + * 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. >>>>> + */ >>>>> + if (folded_name->name) { >>>>> + if (dirent.len == folded_name->len && >>>>> + !memcmp(folded_name->name, dirent.name, dirent.len)) >>>>> + goto out; >>>>> + res = utf8_strncasecmp_folded(um, folded_name, &dirent); >>>> >>>> Shouldn't the memcmp be done with the original user-specified name, not the >>>> casefolded name? I would think that the user-specified name is the one that's >>>> more likely to match the on-disk name, because of case preservation. In most >>>> cases users will specify the same case on both file creation and later access. >>> >>> Yes. >>> >> so the utf8_strncasecmp_folded call here must use name->name instead of folded_name ? > > No, utf8_strncasecmp_folded requires a casefolded name. Eric's point is > that the *memcmp* should always compare against name->name since it's more > likely to match the name on disk than the folded version because the user > is probably doing a case-exact lookup. > > This also means the memcmp can be moved outside the "if (folded_name->name)", > simplifying the patch! >