Received: by 2002:a05:6358:c692:b0:131:369:b2a3 with SMTP id fe18csp1213991rwb; Fri, 28 Jul 2023 06:29:14 -0700 (PDT) X-Google-Smtp-Source: APBJJlGr3Zbz5vSS+r1OmWEk60k6aOsNc52zjoi0KrveQHSWIpAKrRtBsgnK65p0cKJGj3xRvnjl X-Received: by 2002:a05:6a00:2192:b0:664:aff0:240 with SMTP id h18-20020a056a00219200b00664aff00240mr1602442pfi.33.1690550954622; Fri, 28 Jul 2023 06:29:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690550954; cv=none; d=google.com; s=arc-20160816; b=CSCZI33BlX8F23028/9jEsfCCxT71FPve9i8jWPWW6AAD2JydikaJAoOLHjB3xYECS d2WdwkqyvNWTFN6vN+EVU1MUNXcuuy90nw7C/Kplxrk88UvSs/58ttUzDpzQLEc0KSMZ yFCqi8shLtrFxBafN1et908Jv3gs4/sgOXnraIxMXNREoFz0hm86jGEyRTGXVMbTDZ+O bnJChfdnpXiGqoGDPB0n8XVH60dMFSq4xk+8l9oiXJB4jBsYNOvxiAgWhuiiWYw8op+f 7yq9U2Woe/C+a6kLhqIW20gsOSQw8kN1aN7RIDmvQgLITlCs9MDJ+PGQDEGJN5svNrWo AhlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=syoEwursWPUnA3L11lne9/SRYA0L4iVsj1tzYRairOU=; fh=HyZQtDW3Kyuo+75qhtYeSX25dvXiYkRgcFmHWgf9A94=; b=Jp9mbXEmaTqsw3Nx2fW+W1owEzni0uIjeAtscBAJT7oPsNtuohHWCZq19Wm4MHSZs7 o6nByi8BU7s8vXV/oLHJ3L2O3SgMK7IgVt+DXm0+9QC0aVWDfnpvISPOlC1sT5SfqwRm 2S0sEvlYFSN3/rHLokJxqiLBX8Hc4idr4rqw+BIbY8ibpk+Jms6yync85tVah8FcVyTW qLIYStxrIIW2ujTWZxWWMy5CKKGKzla+ibHqur5AjBuppduEe9Azm7f8BXGJDLH3KWjY 9hfdI7xNHi9vvnIr3MofsBP8Ii9GmhCgFS0YkmHVLkUHldJWiZ5P6mPFQvoN2wN9R+ix a+iA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Ujq2W3mo; 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=kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bs1-20020a632801000000b00563e6c095a9si495403pgb.402.2023.07.28.06.28.58; Fri, 28 Jul 2023 06:29:14 -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=@kernel.org header.s=k20201202 header.b=Ujq2W3mo; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234457AbjG1NGi (ORCPT + 99 others); Fri, 28 Jul 2023 09:06:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233855AbjG1NGh (ORCPT ); Fri, 28 Jul 2023 09:06:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C22F8BA; Fri, 28 Jul 2023 06:06:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (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 dfw.source.kernel.org (Postfix) with ESMTPS id 607B162136; Fri, 28 Jul 2023 13:06:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C6311C433C7; Fri, 28 Jul 2023 13:06:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690549595; bh=B5eDKcaoTXLugVjBQrPAJwdWNhFF7TbrpxphDJEcWEg=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Ujq2W3motdbWyEsbwKZCMeTPTQxXd2t1I/SrcH9azhOZn/ak+gQinKrUWl0VTf2Qq BxXIVneSZuWTjRKw/GVZ5ZDZIO6RgPl4uY1ouAQOpfox/+IbfH4rFXKM8LOxulNxNy S9FhAd+MLi+W8qgg7wLIqC4UkLfKVTi1JC7hLBAN9kqj9wQzhaeD3mmieL1R05Kvzg SGyADjFmSatANJnLqL1/PvDvTh0RtoX0UO+/URnyM+Fq0tetNujCWjhvGS0tItAGbM T8eQEQGQwOk7eBnAXurQH7/IPb8QI1SKUhwFATf+bmNwNUehcgoCYj8jwpUKJVOpQc g+NS/HSOSid0A== Date: Fri, 28 Jul 2023 15:06:30 +0200 From: Christian Brauner To: Gabriel Krisman Bertazi Cc: viro@zeniv.linux.org.uk, tytso@mit.edu, ebiggers@kernel.org, jaegeuk@kernel.org, linux-fsdevel@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, Gabriel Krisman Bertazi Subject: Re: [PATCH v4 3/7] libfs: Validate negative dentries in case-insensitive directories Message-ID: <20230728-beckenrand-wahrlich-62d6b0505d68@brauner> References: <20230727172843.20542-1-krisman@suse.de> <20230727172843.20542-4-krisman@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230727172843.20542-4-krisman@suse.de> X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_FILL_THIS_FORM_SHORT,T_SCC_BODY_TEXT_LINE 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 On Thu, Jul 27, 2023 at 01:28:39PM -0400, Gabriel Krisman Bertazi wrote: > From: Gabriel Krisman Bertazi > > Introduce a dentry revalidation helper to be used by case-insensitive > filesystems to check if it is safe to reuse a negative dentry. > > A negative dentry is safe to be reused on a case-insensitive lookup if > it was created during a case-insensitive lookup and this is not a lookup > that will instantiate a dentry. If this is a creation lookup, we also > need to make sure the name matches sensitively the name under lookup in > order to assure the name preserving semantics. > > dentry->d_name is only checked by the case-insensitive d_revalidate hook > in the LOOKUP_CREATE/LOOKUP_RENAME_TARGET case since, for these cases, > d_revalidate is always called with the parent inode read-locked, and > therefore the name cannot change from under us. > > d_revalidate is only called in 4 places: lookup_dcache, __lookup_slow, > lookup_open and lookup_fast: > > - lookup_dcache always calls it with zeroed flags, with the exception > of when coming from __lookup_hash, which needs the parent locked > already, for instance in the open/creation path, which is locked in > open_last_lookups. > > - In __lookup_slow, either the parent inode is read locked by the > caller (lookup_slow), or it is called with no flags (lookup_one*). > The read lock suffices to prevent ->d_name modifications, with the > exception of one case: __d_unalias, will call __d_move to fix a > directory accessible from multiple dentries, which effectively swaps > ->d_name while holding only the shared read lock. This happens > through this flow: > > lookup_slow() //LOOKUP_CREATE > d_lookup() > ->d_lookup() > d_splice_alias() > __d_unalias() > __d_move() > > Nevertheless, this case is not a problem because negative dentries > are not allowed to be moved with __d_move. > > - lookup_open also requires the parent to be locked in the creation > case, which is done in open_last_lookups. > > - lookup_fast will indeed be called with the parent unlocked, but it > shouldn't be called with LOOKUP_CREATE. Either it is called in the > link_path_walk, where nd->flags doesn't have LOOKUP_CREATE yet or in > open_last_lookups. But, in this case, it also never has LOOKUP_CREATE, > because it is only called on the !O_CREAT case, which means op->intent > doesn't have LOOKUP_CREAT (set in build_open_flags only if O_CREAT is > set). > > Finally, for the LOOKUP_RENAME_TARGET, we are doing a rename, so the > parents inodes are also locked. > > Reviewed-by: Theodore Ts'o > Signed-off-by: Gabriel Krisman Bertazi > > --- > Changes since v3: > - Add comment regarding creation (Eric) > - Reorder checks to clarify !flags meaning (Eric) > - Add commit message explanaton of the inode read lock wrt. > __d_move. (Eric) > Changes since v2: > - Add comments to all rejection cases (Eric) > - safeguard against filesystem creating dentries without LOOKUP flags > --- > fs/libfs.c | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 55 insertions(+) > > diff --git a/fs/libfs.c b/fs/libfs.c > index 5b851315eeed..ed04c4dcc312 100644 > --- a/fs/libfs.c > +++ b/fs/libfs.c > @@ -1462,9 +1462,64 @@ static int generic_ci_d_hash(const struct dentry *dentry, struct qstr *str) > return 0; > } > > +static inline int generic_ci_d_revalidate(struct dentry *dentry, > + const struct qstr *name, > + unsigned int flags) > +{ > + if (d_is_negative(dentry)) { > + const struct dentry *parent = READ_ONCE(dentry->d_parent); > + const struct inode *dir = READ_ONCE(parent->d_inode); > + > + if (dir && needs_casefold(dir)) { > + /* > + * Negative dentries created prior to turning the > + * directory case-insensitive cannot be trusted, since > + * they don't ensure any possible case version of the > + * filename doesn't exist. > + */ > + if (!d_is_casefold_lookup(dentry)) > + return 0; > + > + /* > + * Filesystems will call into d_revalidate without > + * setting LOOKUP_ flags even for file creation (see > + * lookup_one* variants). Reject negative dentries in > + * this case, since we can't know for sure it won't be > + * used for creation. > + */ > + if (!flags) > + return 0; > + > + /* > + * If the lookup is for creation, then a negative dentry > + * can only be reused if it's a case-sensitive match, > + * not just a case-insensitive one. This is needed to > + * make the new file be created with the name the user > + * specified, preserving case. > + */ > + if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { > + /* > + * ->d_name won't change from under us in the > + * creation path only, since d_revalidate during > + * creation and renames is always called with > + * the parent inode locked. It isn't the case > + * for all lookup callpaths, so ->d_name must > + * not be touched outside > + * (LOOKUP_CREATE|LOOKUP_RENAME_TARGET) context. > + */ > + if (dentry->d_name.len != name->len || > + memcmp(dentry->d_name.name, name->name, name->len)) > + return 0; > + } > + } > + } > + return 1; > +} > + > static const struct dentry_operations generic_ci_dentry_ops = { > .d_hash = generic_ci_d_hash, > .d_compare = generic_ci_d_compare, > + .d_revalidate_name = generic_ci_d_revalidate, > }; > #endif Wouldn't it make sense to get rid of all this indentation? const struct dentry *parent; const struct inode *dir; if (!d_is_negative(dentry)) return 1; parent = READ_ONCE(dentry->d_parent); dir = READ_ONCE(parent->d_inode); if (!dir) return 1; if (!needs_casefold(dir)) return 1; /* * Negative dentries created prior to turning the * directory case-insensitive cannot be trusted, since * they don't ensure any possible case version of the * filename doesn't exist. */ if (!d_is_casefold_lookup(dentry)) return 0; /* * Filesystems will call into d_revalidate without * setting LOOKUP_ flags even for file creation (see * lookup_one* variants). Reject negative dentries in * this case, since we can't know for sure it won't be * used for creation. */ if (!flags) return 0; /* * If the lookup is for creation, then a negative dentry * can only be reused if it's a case-sensitive match, * not just a case-insensitive one. This is needed to * make the new file be created with the name the user * specified, preserving case. */ if (flags & (LOOKUP_CREATE | LOOKUP_RENAME_TARGET)) { /* * ->d_name won't change from under us in the * creation path only, since d_revalidate during * creation and renames is always called with * the parent inode locked. It isn't the case * for all lookup callpaths, so ->d_name must * not be touched outside * (LOOKUP_CREATE|LOOKUP_RENAME_TARGET) context. */ if (dentry->d_name.len != name->len || memcmp(dentry->d_name.name, name->name, name->len)) return 0; } return 1;