Received-SPF: pass (google.com: domain of linux-ext4-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Andreas Dilger <adilger@dilger.ca>
Message-Id: <317E7E03-9620-4610-8DA5-63221FE41F04@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_B03EA783-7B75-4554-A00C-B7E221071E74";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH 4/9] ext4: don't call fscrypt_get_encryption_info() from
 dx_show_leaf()
Date:   Wed, 2 Dec 2020 15:48:37 -0700
In-Reply-To: <20201125002336.274045-5-ebiggers@kernel.org>
Cc:     linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org,
        linux-f2fs-devel@lists.sourceforge.net,
        linux-mtd@lists.infradead.org, linux-fsdevel@vger.kernel.org
To:     Eric Biggers <ebiggers@kernel.org>
References: <20201125002336.274045-1-ebiggers@kernel.org>
 <20201125002336.274045-5-ebiggers@kernel.org>
Precedence: bulk


--Apple-Mail=_B03EA783-7B75-4554-A00C-B7E221071E74
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=us-ascii

On Nov 24, 2020, at 5:23 PM, Eric Biggers <ebiggers@kernel.org> wrote:
> 
> From: Eric Biggers <ebiggers@google.com>
> 
> The call to fscrypt_get_encryption_info() in dx_show_leaf() is too low
> in the call tree; fscrypt_get_encryption_info() should have already been
> called when starting the directory operation.  And indeed, it already
> is.  Moreover, the encryption key is guaranteed to already be available
> because dx_show_leaf() is only called when adding a new directory entry.
> 
> And even if the key wasn't available, dx_show_leaf() uses
> fscrypt_fname_disk_to_usr() which knows how to create a no-key name.
> 
> So for the above reasons, and because it would be desirable to stop
> exporting fscrypt_get_encryption_info() directly to filesystems, remove
> the call to fscrypt_get_encryption_info() from dx_show_leaf().
> 
> Signed-off-by: Eric Biggers <ebiggers@google.com>

Reviewed-by: Andreas Dilger <adilger@dilger.ca>

> ---
> fs/ext4/namei.c | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
> 
> diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c
> index 793fc7db9d28..7b31aea3e025 100644
> --- a/fs/ext4/namei.c
> +++ b/fs/ext4/namei.c
> @@ -643,13 +643,7 @@ static struct stats dx_show_leaf(struct inode *dir,
> 
> 				name  = de->name;
> 				len = de->name_len;
> -				if (IS_ENCRYPTED(dir))
> -					res = fscrypt_get_encryption_info(dir);
> -				if (res) {
> -					printk(KERN_WARNING "Error setting up"
> -					       " fname crypto: %d\n", res);
> -				}
> -				if (!fscrypt_has_encryption_key(dir)) {
> +				if (!IS_ENCRYPTED(dir)) {
> 					/* Directory is not encrypted */
> 					ext4fs_dirhash(dir, de->name,
> 						de->name_len, &h);
> --
> 2.29.2
> 


Cheers, Andreas


--Apple-Mail=_B03EA783-7B75-4554-A00C-B7E221071E74
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
	filename=signature.asc
Content-Type: application/pgp-signature;
	name=signature.asc
Content-Description: Message signed with OpenPGP

-----BEGIN PGP SIGNATURE-----
Comment: GPGTools - http://gpgtools.org

iQIzBAEBCAAdFiEEDb73u6ZejP5ZMprvcqXauRfMH+AFAl/IGcUACgkQcqXauRfM
H+CFUQ/7BW3B4eOfjKM/CmfaV3AGSXDkVCxci+BVZOXQd5jPh0jD6P+vnNHrVvaJ
OrmL9sLLzlXw39gLrZk21geNwdDWRXvNSp+mY0TmTjDBGeTvrQQydNMziRYs6xcS
+Dei6c8LQA05JAqTDHbzV9rVRE/Xxbdsux09cUB21Agt3ruFi/90TPK7G6s3ObJD
Asbh05XZ1JqaZ8W65AUPlQzwqrLXL8WCS/Qkfp0nsXWvebKRdrDtJ8FaEPjiZkeF
rhS72LzdH8Arwc4kHVe1TVw4txY0su010X14LXUIQXZT8MjZrkbArOtPut+XMrpX
8IdD3KaUFhBAvB89fK2QIN62Y+RRiPkSXQFHCz/P/S/ruRjxnjaG57PesasV/D4D
4aYArbY8+QgrpbqY8AayIDZNqOkf9xMc5xD3nm5hjqN1htXPnHxozSUa31+CXRuC
nSb1MvlGtQX6j2cpXtTrrm4jwVKW8W4JhMaUBWmaUTKvxmZvfBpOQ6BSfaSBHuDW
2mgj4jQAiqw/9ZIMY9QYKjQZszI9CUXXZdstrqhJhoQM6z4etgh3yKkvnp2gR9QP
xSwGVQ6D8z+AECS7YLnZIgrVyK4Fb9Adha36LbjFyvt0+sRroXbtMsorXLorJmQi
30z/sqoYZ5O7zhIvTegvrIJZrjuX6XPT80DQqhswJFw2fteJFsQ=
=Ks9F
-----END PGP SIGNATURE-----

--Apple-Mail=_B03EA783-7B75-4554-A00C-B7E221071E74--