From patchwork Thu Mar 9 12:19:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 66829 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp260217wrd; Thu, 9 Mar 2023 04:29:06 -0800 (PST) X-Google-Smtp-Source: AK7set/GBoq7MT2hLPpssgf9ds9XTMP4kBheRv2Q3HBjDRo5dVeXTTLtadmnhB0xl1sD3BCdzVwU X-Received: by 2002:a05:6a20:ba94:b0:c6:c030:81aa with SMTP id fb20-20020a056a20ba9400b000c6c03081aamr19231336pzb.59.1678364946588; Thu, 09 Mar 2023 04:29:06 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678364946; cv=none; d=google.com; s=arc-20160816; b=irr368R0Cys5lUwXj5YNDxoasjvOTUWYhTB14QHIcDTVBWUFeb6hgDJ0gbg26Bqh1q W8RF/N8ym/0v2QJjcGsMfaahaAe+TEYOYDki+/QU2VHaC8qMJY5Hu/wZ6hM6NBI2WEKN LXmHF627T4Ee90W29hTRGXCy08CHnG8WWyFQpbL+oyJ1lNSx+nzfNuLzC/Oce/v2K3vg 1CgAiAdViOsnrhzgHPd7FpmvjJslFz8vnuV0rHUYtq/V5uSzqpCLEK7SX8O2yY742vET Qb/LjzofdY4XGExsl7XWYmqMNL680KbT+fMeoGg0K1YMymdjXl3oZRvVJQwxytlt8fJx Q3gA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=gkKulOGIgQcOiccW8SiWFbG5uMFAl4MHpehodedeHSc=; b=f0U04BTT0k+VVbbQVefpmHFuL55mf9Mpfui8niGKUJic94dkmVfxnEsje178OIWayW JRYGmnIRCDI/90NUSw38uTdYyNk/BAlEm51tpyTUPxd4YZR3m/GNYmaHighR6eYpF+TH GgTPkiZ0tHCdKRHaAaxhZMESSWucGlTJzoBnRca2RC7L5HN4Km+OFpfi6doJM4yJbMWX pOFm2ZjifZdrUFg0rI18A5Q+rZF2MPpbGnnOM7yoVspSL0/TiSq7USydIv8gW9rBZfmA /Ao3PtD5EnxPZdFqjyhO520/lJOJWhJrrzWBX7gXGXdLQifJSiqGp1m2CoNS2CdkXSrq EMpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=1wEPudR2; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=N5rJGRIV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x184-20020a6231c1000000b005a9d56804c1si17001025pfx.31.2023.03.09.04.28.53; Thu, 09 Mar 2023 04:29:06 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=@suse.de header.s=susede2_rsa header.b=1wEPudR2; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=N5rJGRIV; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230271AbjCIMTV (ORCPT + 99 others); Thu, 9 Mar 2023 07:19:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33696 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229672AbjCIMTS (ORCPT ); Thu, 9 Mar 2023 07:19:18 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 09EABE9CDC; Thu, 9 Mar 2023 04:19:17 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id B8FFA21B92; Thu, 9 Mar 2023 12:19:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678364355; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gkKulOGIgQcOiccW8SiWFbG5uMFAl4MHpehodedeHSc=; b=1wEPudR2xQ1GZWaU4drB20//AEVuWkCc5Lidb2lMvEpcSdinGnULBy5ZIZQER3YSxE+J+N bhABYqqxNWbxFQdvS4iHWE/sk0JWvc0CpWwIe6DmyxTqI3Jj2t6FTOdXqHZ7RMe2Ap7MHV SGdzRcPTEWLNNw6T6Vl+l4y5MfuY+Rw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678364355; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gkKulOGIgQcOiccW8SiWFbG5uMFAl4MHpehodedeHSc=; b=N5rJGRIVDLnZRfm5xv0pFjnznGJwFgGQlZu08Dzrj2tnJ9Sr4vK8V0dt2pvL2d1zaxK+TD ic+Nd89XBOztHsDw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 0BDE913A10; Thu, 9 Mar 2023 12:19:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id qIx2O8LOCWSqbAAAMHmgww (envelope-from ); Thu, 09 Mar 2023 12:19:14 +0000 Received: from localhost (brahms.olymp [local]) by brahms.olymp (OpenSMTPD) with ESMTPA id d897faab; Thu, 9 Mar 2023 12:19:13 +0000 (UTC) From: =?utf-8?q?Lu=C3=ADs_Henriques?= To: Eric Biggers , Xiubo Li , Jeff Layton Cc: "Theodore Y. Ts'o" , Jaegeuk Kim , Ilya Dryomov , linux-fscrypt@vger.kernel.org, ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Lu?= =?utf-8?q?=C3=ADs_Henriques?= Subject: [RFC PATCH 1/2] fscrypt: new helper function - __fscrypt_prepare_atomic_open() Date: Thu, 9 Mar 2023 12:19:09 +0000 Message-Id: <20230309121910.18939-2-lhenriques@suse.de> In-Reply-To: <20230309121910.18939-1-lhenriques@suse.de> References: <20230309121910.18939-1-lhenriques@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759893202262930021?= X-GMAIL-MSGID: =?utf-8?q?1759893202262930021?= This patch introduces a new helper function which prepares an atomic_open. Because atomic open can act as a lookup if handed a dentry that is negative, we need to set DCACHE_NOKEY_NAME if the key for the parent isn't available. The reason for getting the encryption info before checking if the directory has the encryption key is because we may have the key available but the encryption info isn't yet set (maybe due to a drop_caches). The regular open path will use fscrypt_file_open for that but in the atomic open a different approach is required. Signed-off-by: Luís Henriques --- fs/crypto/hooks.c | 14 ++++++++++++++ include/linux/fscrypt.h | 6 ++++++ 2 files changed, 20 insertions(+) diff --git a/fs/crypto/hooks.c b/fs/crypto/hooks.c index 7b8c5a1104b5..cbb828ecc5eb 100644 --- a/fs/crypto/hooks.c +++ b/fs/crypto/hooks.c @@ -117,6 +117,20 @@ int __fscrypt_prepare_readdir(struct inode *dir) } EXPORT_SYMBOL_GPL(__fscrypt_prepare_readdir); +int __fscrypt_prepare_atomic_open(struct inode *dir, struct dentry *dentry) +{ + int err = fscrypt_get_encryption_info(dir, true); + + if (err || (!err && !fscrypt_has_encryption_key(dir))) { + spin_lock(&dentry->d_lock); + dentry->d_flags |= DCACHE_NOKEY_NAME; + spin_unlock(&dentry->d_lock); + } + + return err; +} +EXPORT_SYMBOL_GPL(__fscrypt_prepare_atomic_open); + int __fscrypt_prepare_setattr(struct dentry *dentry, struct iattr *attr) { if (attr->ia_valid & ATTR_SIZE) diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 4f5f8a651213..51c4b216a625 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -362,6 +362,7 @@ int __fscrypt_prepare_rename(struct inode *old_dir, struct dentry *old_dentry, int __fscrypt_prepare_lookup(struct inode *dir, struct dentry *dentry, struct fscrypt_name *fname); int __fscrypt_prepare_readdir(struct inode *dir); +int __fscrypt_prepare_atomic_open(struct inode *dir, struct dentry *dentry); int __fscrypt_prepare_setattr(struct dentry *dentry, struct iattr *attr); int fscrypt_prepare_setflags(struct inode *inode, unsigned int oldflags, unsigned int flags); @@ -688,6 +689,11 @@ static inline int __fscrypt_prepare_readdir(struct inode *dir) return -EOPNOTSUPP; } +int __fscrypt_prepare_atomic_open(struct inode *dir, struct dentry *dentry) +{ + return -EOPNOTSUPP; +} + static inline int __fscrypt_prepare_setattr(struct dentry *dentry, struct iattr *attr) { From patchwork Thu Mar 9 12:19:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 66830 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp268270wrd; Thu, 9 Mar 2023 04:46:42 -0800 (PST) X-Google-Smtp-Source: AK7set9t6HpB77L6Bt9omHnSZAJEPCKCb3DGzoYEFEUxbEdQI8zN6iJNtBqp5sfXzsnEIwlr+971 X-Received: by 2002:a05:6a20:12c3:b0:c7:40f8:73d3 with SMTP id v3-20020a056a2012c300b000c740f873d3mr27667338pzg.33.1678366002246; Thu, 09 Mar 2023 04:46:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678366002; cv=none; d=google.com; s=arc-20160816; b=LW7H22p7WZFNXjDgMcgjNWBFbrR5Q+BaFtMPmGIYLxtVCS3XXuulzSqOBXLBUudCQz CszRvK73s+2GapJMw4TJqU/I74cf91kc0H2Uqip382RmnGeC9SSVSh05M1b5h9JbiDst vekfnfqtkZ/pt3/2xN3+vqLEBF9Zq64dqM5a7PeolwKTzEXSULvLpR7Tjk7fetZS37nV QhvmWmHCVXdFZr6xPWeM9EV6Q905H3hRM5mbAPHV225zOWSqMt69aijblVjKTbw1X2os A/H9oimaZkuVMUhtzXryTnAC4KEdQIYJKPzgVLM0Lz0B+WrtGNdyWo6rHNdcx1/PpnpM 1Wvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:dkim-signature; bh=oli8EhB6KlmXeSRgfZx/pECT9CAq14msmtKRHkakxXU=; b=zDBR0j/6f9V7i/rTctXTCGaF8CDEtlODJKfkxJWYGw729Fhgi0eQbQPEEFKqSsj+A+ b9uqNhAdblhG07Z5thFYAC6NLXr4BJ841tb1HSeqejRPR64/E3YhulUZXr7z4Ft3J8dj bdIOXq0AbUADPEaBKuIsl/cG3yY746IY2akhNv06Sg2thUdDupHdh3cT52YaKrQfHrnx JRJR87ZL0Ecd/mpI7MuFxmsyDEUTSzb6VstT8Ai+2zalEdreQWJUe8NKE62D5a5B264J g+Of5z/63CnCx1XCTh7qgWWTQTwzN71fHmyflLStI3c4E5WqsTv4miF1u75pO4ApU8e1 aYsg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=SR2Do+oO; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=AqFW4Cg3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w68-20020a636247000000b004fb9330dcfcsi18671036pgb.323.2023.03.09.04.46.26; Thu, 09 Mar 2023 04:46:42 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-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=@suse.de header.s=susede2_rsa header.b=SR2Do+oO; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=AqFW4Cg3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=suse.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230283AbjCIMTZ (ORCPT + 99 others); Thu, 9 Mar 2023 07:19:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230186AbjCIMTS (ORCPT ); Thu, 9 Mar 2023 07:19:18 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C44A8168BF; Thu, 9 Mar 2023 04:19:17 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 8254221C15; Thu, 9 Mar 2023 12:19:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678364356; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oli8EhB6KlmXeSRgfZx/pECT9CAq14msmtKRHkakxXU=; b=SR2Do+oOxkvTLsEkVtA70gk4iSezWPX6Np5ZenfcHhW9kkwWTRWb2EyAVafX9HBp1jjTIo 6mi5pV4Kr45n1HojWHxKFg0LVgTR9VI/dH3sMp7G1BLV1vIBHSPfVBtVb4objWDuumrK4j 5ZFA4i+m1SA2gss9tsrWzuOWIw2a26A= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678364356; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=oli8EhB6KlmXeSRgfZx/pECT9CAq14msmtKRHkakxXU=; b=AqFW4Cg3nAqRj9g4u1NbrUsKw1WDAjNAsOjE2usKK5x5YpH/QR2eN2BPtjr3bNlasb5U1O +ujiB4mpzZX7NYDA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id CC69213A10; Thu, 9 Mar 2023 12:19:15 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id mO3XLsPOCWSqbAAAMHmgww (envelope-from ); Thu, 09 Mar 2023 12:19:15 +0000 Received: from localhost (brahms.olymp [local]) by brahms.olymp (OpenSMTPD) with ESMTPA id 0130bd2e; Thu, 9 Mar 2023 12:19:13 +0000 (UTC) From: =?utf-8?q?Lu=C3=ADs_Henriques?= To: Eric Biggers , Xiubo Li , Jeff Layton Cc: "Theodore Y. Ts'o" , Jaegeuk Kim , Ilya Dryomov , linux-fscrypt@vger.kernel.org, ceph-devel@vger.kernel.org, linux-kernel@vger.kernel.org, =?utf-8?q?Lu?= =?utf-8?q?=C3=ADs_Henriques?= Subject: [RFC PATCH 2/2] ceph: switch atomic open to use new fscrypt helper Date: Thu, 9 Mar 2023 12:19:10 +0000 Message-Id: <20230309121910.18939-3-lhenriques@suse.de> In-Reply-To: <20230309121910.18939-1-lhenriques@suse.de> References: <20230309121910.18939-1-lhenriques@suse.de> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS 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-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1759894309510302015?= X-GMAIL-MSGID: =?utf-8?q?1759894309510302015?= Switch ceph atomic open to use __fscrypt_prepare_atomic_open(). This fixes a bug where a dentry is incorrectly set with DCACHE_NOKEY_NAME. This happens when 'dir' has been evicted but the key is still available (for example, where there's a drop_caches). Signed-off-by: Luís Henriques --- fs/ceph/file.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fs/ceph/file.c b/fs/ceph/file.c index dee3b445f415..bdd7a7de7d9e 100644 --- a/fs/ceph/file.c +++ b/fs/ceph/file.c @@ -795,11 +795,9 @@ int ceph_atomic_open(struct inode *dir, struct dentry *dentry, ihold(dir); if (IS_ENCRYPTED(dir)) { set_bit(CEPH_MDS_R_FSCRYPT_FILE, &req->r_req_flags); - if (!fscrypt_has_encryption_key(dir)) { - spin_lock(&dentry->d_lock); - dentry->d_flags |= DCACHE_NOKEY_NAME; - spin_unlock(&dentry->d_lock); - } + err = __fscrypt_prepare_atomic_open(dir, dentry); + if (err) + goto out_req; } if (flags & O_CREAT) {