From patchwork Tue Mar 14 10:39:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 69495 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1684308wrd; Tue, 14 Mar 2023 03:55:21 -0700 (PDT) X-Google-Smtp-Source: AK7set/baqcgttgsk5KSy6BYh3A+1IcqivV+YSloUecr4NgyEZsPN5wVRLE16Bk2FJ2QZXLpkb0W X-Received: by 2002:a17:902:d50e:b0:1a0:6852:16dd with SMTP id b14-20020a170902d50e00b001a0685216ddmr2051486plg.12.1678791321289; Tue, 14 Mar 2023 03:55:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678791321; cv=none; d=google.com; s=arc-20160816; b=o0zu/prG1pBk+CeQk49fsk7F3MwlaYX8RkkL8AWq9vxdodaqECETsQErP9jzL5xZaj ba7oZTpH9dI1B+jXgBLPbxgk+BAzpHLJ26vUghzM9wXZSkBKKmASffkG7/V4IMDsnOWC ps6boV2vLjRt+kzoVzR1GgbhuhLvH5+A6ELMNvbgLLTAZ795yHsfojrj2cuUZAKq9qHv fcQw/+V6Ok2d+HPgFJvC3x5LErrqZwJbEw4N18fCsRW6powXM3eTynelgGhXE2B5+sYC OHDzxKP1uJMLfbmTnEdiVQ9plFV7QQ/8WA96hvLJXhAMKB+k+c+8UqvsESyLw82xf8ry X0mA== 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=lXpeUENOVL0/Czrcbie4Fl5tkihbr0boSVc43vZ6le0=; b=mDX7C5P6GkIThq2/ive320Mcelp7dTjS58yCuj3clY6WCXkIUxywaIyrA0yRAZttUv kj+zmyxSEC54OBfvylPP487+W3KL6/iMYho7da3z3LSL5y/SYb6FE7cjfcIgz6XUE4l+ VE6Ug+6OE+i7Dh2SOK7yHsBlFvk63ftJGplVw6aLXM5beDPk46mFVTjrYUkI/J+CNwfn 8YwZR7Zth5fnxmh8OMla6ybvwZEsiMl0qqEfbxQ1+sRMujw2v+P2y2x0cQi79Ku/U25o L75kH6eMkp9i1QG6wPvLr3ZRd/M8xDcli9+y9ZjUJ98O+IsveB0cI0G44+vqMhsMMz+J h5Bg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=Z9PfuxwI; dkim=neutral (no key) header.i=@suse.de header.b="/G8hseUb"; 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 w1-20020a170902a70100b00194967b7badsi2068086plq.591.2023.03.14.03.55.07; Tue, 14 Mar 2023 03:55:21 -0700 (PDT) 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=Z9PfuxwI; dkim=neutral (no key) header.i=@suse.de header.b="/G8hseUb"; 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 S229926AbjCNKk5 (ORCPT + 99 others); Tue, 14 Mar 2023 06:40:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37168 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229516AbjCNKkr (ORCPT ); Tue, 14 Mar 2023 06:40:47 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7723520066; Tue, 14 Mar 2023 03:40:20 -0700 (PDT) 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-out2.suse.de (Postfix) with ESMTPS id DC1431F88C; Tue, 14 Mar 2023 10:39:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678790345; 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=lXpeUENOVL0/Czrcbie4Fl5tkihbr0boSVc43vZ6le0=; b=Z9PfuxwIIc5rqCtweTGg3hWo59RW+/6ocULRVrpd1KEjoR7MOdPxuyb4vpFCmUm5m4+KVX Z/38jta4sX67vr4tp4kOx/HZHmNKU5gr+l0CbJP1ebECdbseuzb//6wa+X7VY/qZQSVs67 j28C+8JOJp3Mz1qVCyorSR+GGoC12CU= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678790345; 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=lXpeUENOVL0/Czrcbie4Fl5tkihbr0boSVc43vZ6le0=; b=/G8hseUbm1026Kcf5vnHC15iIAvWyaAvIFDJk0Ixdq6NjaopCwZiXKmHA7HCKsQbjJdZkV n/+zjroxfNfYefAA== 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 3378113A1B; Tue, 14 Mar 2023 10:39:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id +EBtCclOEGS4FQAAMHmgww (envelope-from ); Tue, 14 Mar 2023 10:39:05 +0000 Received: from localhost (brahms.olymp [local]) by brahms.olymp (OpenSMTPD) with ESMTPA id 219aa8f7; Tue, 14 Mar 2023 10:39:03 +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: [PATCH v2 1/2] fscrypt: new helper function - fscrypt_prepare_atomic_open() Date: Tue, 14 Mar 2023 10:39:01 +0000 Message-Id: <20230314103902.32592-2-lhenriques@suse.de> In-Reply-To: <20230314103902.32592-1-lhenriques@suse.de> References: <20230314103902.32592-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,URIBL_BLOCKED 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?1760340288445115540?= X-GMAIL-MSGID: =?utf-8?q?1760340288445115540?= 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 call fscrypt_file_open() which uses function fscrypt_require_key() for setting the encryption info if needed. The atomic open needs to do something similar. Signed-off-by: Luís Henriques Reviewed-by: Xiubo Li --- fs/crypto/hooks.c | 33 +++++++++++++++++++++++++++++++++ include/linux/fscrypt.h | 7 +++++++ 2 files changed, 40 insertions(+) diff --git a/fs/crypto/hooks.c b/fs/crypto/hooks.c index 7b8c5a1104b5..165ddf01bf9f 100644 --- a/fs/crypto/hooks.c +++ b/fs/crypto/hooks.c @@ -117,6 +117,39 @@ int __fscrypt_prepare_readdir(struct inode *dir) } EXPORT_SYMBOL_GPL(__fscrypt_prepare_readdir); +/** + * fscrypt_prepare_atomic_open() - prepare an atomic open on an encrypted directory + * @dir: inode of parent directory + * @dentry: dentry being 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 the key may be available but the encryption + * info isn't yet set (maybe due to a drop_caches). The regular open path will + * call fscrypt_file_open() which uses function fscrypt_require_key() for + * setting the encryption info if needed. The atomic open needs to do something + * similar. + * + * Return: 0 on success, or an error code if fscrypt_get_encryption_info() + * fails. + */ +int fscrypt_prepare_atomic_open(struct inode *dir, struct dentry *dentry) +{ + int err; + + err = fscrypt_get_encryption_info(dir, true); + if (!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..c70acb2a737a 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,12 @@ static inline int __fscrypt_prepare_readdir(struct inode *dir) return -EOPNOTSUPP; } +static inline 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 Tue Mar 14 10:39:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Luis Henriques X-Patchwork-Id: 69494 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp1683621wrd; Tue, 14 Mar 2023 03:53:16 -0700 (PDT) X-Google-Smtp-Source: AK7set/8wD1Fa7NAbVoY+CrPWPnpZk8hw8otrdx+x1NwDMmpNuiKXOeJNovZvEIbS6SoFzqG9dZf X-Received: by 2002:a17:90a:c218:b0:23d:1143:1e3c with SMTP id e24-20020a17090ac21800b0023d11431e3cmr5488377pjt.44.1678791196100; Tue, 14 Mar 2023 03:53:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678791196; cv=none; d=google.com; s=arc-20160816; b=KTUNv+72UztX7B4MCEZb1diB7Y5P6LjZ5y3h2xCjLZ8kJplXTeVFtSpMQK2C9BUw0d vcf+uy/cr+b5ZYZEAhQ/bKHA6k0Neybj969sW17XESMM4lQpEZt5UzIqJy6cv4l7BxVm Kn1cr5YiLEeANDyDJsL0R5fURM6ZCGUmwqDFidzX6H/0lAqjnPOzh4L4OVLoLxMziEE+ Jhn98d9a6/2ZiMyJqGm5tznCgw+OyF5hXvb5Sj9aDKKh9xRuvroNXqXUTHRQM44yam9S yWT/PuZOmW6fAESY2Ppx02Ljs4GVrl6HqENqJEyk4MQrhdGfWKqCrtCS/4wtql9/Kykm 9doA== 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=Wi/DSEelWohyw8yWLL1NnkiRzPqUQBsHap+bfimcrtg=; b=dR6d43NSA1X7Wt0z0xQBcioU3vsS/2EhfXmDT+Hv1srDx2B09KQ6PuolsSu/XAU91l mQLzpdh97RLrg/I/EuCHdyMoHGJEvl6r2+UsVtYtXfdpZZo+vX1hBzJholFnF8VmJ8MT raz/6ZPeI2txkaC6DSu0zrxd6yUpQ7/TFrF+bElIGWklisu1bwi06EM+1CCl9Dm4hjim UOfcoj+CVewk9XCHQtLncnLYYzW/7EaNTu9GD+8nd1jfHCR4rqwqoyVFIXnKU8F02ueb MDXjBZYjAHHjBgRg3piGn/Rx54DwFmuBovGltParOAZXMtX0XgZoprfIyItzjViybHYG pK0A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@suse.de header.s=susede2_rsa header.b=pp8rp5gw; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=mEm3aYc7; 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 h10-20020a17090a710a00b00234bcb4bce5si2141265pjk.51.2023.03.14.03.53.02; Tue, 14 Mar 2023 03:53:16 -0700 (PDT) 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=pp8rp5gw; dkim=neutral (no key) header.i=@suse.de header.s=susede2_ed25519 header.b=mEm3aYc7; 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 S230104AbjCNKlB (ORCPT + 99 others); Tue, 14 Mar 2023 06:41:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37106 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229582AbjCNKkr (ORCPT ); Tue, 14 Mar 2023 06:40:47 -0400 Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1BA938EA3F; Tue, 14 Mar 2023 03:40:21 -0700 (PDT) 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-out2.suse.de (Postfix) with ESMTPS id 981D51F894; Tue, 14 Mar 2023 10:39:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1678790346; 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=Wi/DSEelWohyw8yWLL1NnkiRzPqUQBsHap+bfimcrtg=; b=pp8rp5gwg206RXFeooK4jU9ksfs9M6tYkg43eV6GpTap9x1zwwRTMxjHk7FhgJbTGA8VVi flKSk6U1iXTSvb6g1+YWsEwKatYqa6Qi8ioRY6sij7Tt/ojb3X9zYJibWrVnCxpOMxNzcN 3lRfpTUoWhEiWOoY8n7VmQH/qWUhjcQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1678790346; 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=Wi/DSEelWohyw8yWLL1NnkiRzPqUQBsHap+bfimcrtg=; b=mEm3aYc73pxlRITgq89dOa5lD05SfAzogKumS9LMmhmijNmclN93Sb8SETIuQUwBx4Z/U0 EqlV/xMc7iQR9WCQ== 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 F096213A1B; Tue, 14 Mar 2023 10:39:05 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id oES2N8lOEGS4FQAAMHmgww (envelope-from ); Tue, 14 Mar 2023 10:39:05 +0000 Received: from localhost (brahms.olymp [local]) by brahms.olymp (OpenSMTPD) with ESMTPA id 39770183; Tue, 14 Mar 2023 10:39:03 +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: [PATCH v2 2/2] ceph: switch atomic open to use new fscrypt helper Date: Tue, 14 Mar 2023 10:39:02 +0000 Message-Id: <20230314103902.32592-3-lhenriques@suse.de> In-Reply-To: <20230314103902.32592-1-lhenriques@suse.de> References: <20230314103902.32592-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,URIBL_BLOCKED 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?1760340157048298264?= X-GMAIL-MSGID: =?utf-8?q?1760340157048298264?= Switch ceph atomic open to use fscrypt_prepare_atomic_open(). This fixes a bug where a dentry is incorrectly set with DCACHE_NOKEY_NAME 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..5ad57cc4c13b 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) {