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: <A2F01966-90F0-4DD2-A61C-21414666EF9A@dilger.ca>
Content-Type: multipart/signed;
 boundary="Apple-Mail=_5B6E5F61-8EF9-4DE3-806E-E887B9EB323B";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Mime-Version: 1.0 (Mac OS X Mail 10.3 \(3273\))
Subject: Re: [PATCH 6/9] fscrypt: move body of fscrypt_prepare_setattr()
 out-of-line
Date:   Wed, 2 Dec 2020 15:53:50 -0700
In-Reply-To: <20201125002336.274045-7-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-7-ebiggers@kernel.org>
Precedence: bulk


--Apple-Mail=_5B6E5F61-8EF9-4DE3-806E-E887B9EB323B
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain;
	charset=us-ascii

On Nov 24, 2020, at 5:23 PM, Eric Biggers <ebiggers@kernel.org> wrote:
>=20
> From: Eric Biggers <ebiggers@google.com>
>=20
> In preparation for reducing the visibility of fscrypt_require_key() by
> moving it to fscrypt_private.h, move the call to it from
> fscrypt_prepare_setattr() to an out-of-line function.
>=20
> Signed-off-by: Eric Biggers <ebiggers@google.com>

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

> ---
> fs/crypto/hooks.c       |  8 ++++++++
> include/linux/fscrypt.h | 11 +++++++++--
> 2 files changed, 17 insertions(+), 2 deletions(-)
>=20
> diff --git a/fs/crypto/hooks.c b/fs/crypto/hooks.c
> index 82f351d3113a..1c16dba222d9 100644
> --- a/fs/crypto/hooks.c
> +++ b/fs/crypto/hooks.c
> @@ -120,6 +120,14 @@ int __fscrypt_prepare_readdir(struct inode *dir)
> }
> EXPORT_SYMBOL_GPL(__fscrypt_prepare_readdir);
>=20
> +int __fscrypt_prepare_setattr(struct dentry *dentry, struct iattr =
*attr)
> +{
> +	if (attr->ia_valid & ATTR_SIZE)
> +		return fscrypt_require_key(d_inode(dentry));
> +	return 0;
> +}
> +EXPORT_SYMBOL_GPL(__fscrypt_prepare_setattr);
> +
> /**
>  * fscrypt_prepare_setflags() - prepare to change flags with =
FS_IOC_SETFLAGS
>  * @inode: the inode on which flags are being changed
> diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h
> index 8cbb26f55695..b20900bb829f 100644
> --- a/include/linux/fscrypt.h
> +++ b/include/linux/fscrypt.h
> @@ -243,6 +243,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_setattr(struct dentry *dentry, struct iattr =
*attr);
> int fscrypt_prepare_setflags(struct inode *inode,
> 			     unsigned int oldflags, unsigned int flags);
> int fscrypt_prepare_symlink(struct inode *dir, const char *target,
> @@ -543,6 +544,12 @@ static inline int =
__fscrypt_prepare_readdir(struct inode *dir)
> 	return -EOPNOTSUPP;
> }
>=20
> +static inline int __fscrypt_prepare_setattr(struct dentry *dentry,
> +					    struct iattr *attr)
> +{
> +	return -EOPNOTSUPP;
> +}
> +
> static inline int fscrypt_prepare_setflags(struct inode *inode,
> 					   unsigned int oldflags,
> 					   unsigned int flags)
> @@ -840,8 +847,8 @@ static inline int fscrypt_prepare_readdir(struct =
inode *dir)
> static inline int fscrypt_prepare_setattr(struct dentry *dentry,
> 					  struct iattr *attr)
> {
> -	if (attr->ia_valid & ATTR_SIZE)
> -		return fscrypt_require_key(d_inode(dentry));
> +	if (IS_ENCRYPTED(d_inode(dentry)))
> +		return __fscrypt_prepare_setattr(dentry, attr);
> 	return 0;
> }
>=20
> --
> 2.29.2
>=20


Cheers, Andreas


--Apple-Mail=_5B6E5F61-8EF9-4DE3-806E-E887B9EB323B
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/IGv4ACgkQcqXauRfM
H+BEuhAAm/v75p+tdLX3VyODRb1mULfJBeY25WD5wMaqEAkSuLZUmUfepeSljY0f
ok/rpkOYVBtfzQB4YS30GMjC/HbKUdkmPuvWfHpFsLKO7CPHJMZcr2FQFNYlIaLR
Of6kEFqSpxNNh46FOEq+ufFbNxWj++Tq7agI8b7qtp8AscEdRBydLmf1O92GAJMh
O4hG6LlHAtS8W0zFjXm+QXw7aO5a1fkeG8BzD05VPwVI2EAksxCJl3oRFgLnQ8go
c0+NOiEc31MlE8v0KSBhWvvYNIDvVsrqX/IBcHAU2bAULVLTiF41EFPZhZD1ddgu
I8VN9tedrK4sZ0uTwtamzBwUDTQbWQD6mdzX57NXpgha8zU+cN8OJ5UeVByyDhLX
uD1GnM2x8WvzkWd+EIfgNpXZ1kRKZr6LnefMT3lhSjPrDPDzs/QFjMDqLtakdGPa
+Dl9eGB9Y6HE5CkX2b5KDn94gKbEgXdPIJZ8QzBLPcukwhjpBlwNQrRBrybF0UEC
6IuWi+6dqCPJ1B+z6H7BLVVQ/IgyEfgdFLyFzTQ1PwSCW/8Qna37XF9UFODhYyrH
q9lVoWV/HAvHqdTtC5BJNHFPb7qE5cs4YB1yQ7FWw2PseRAK0+tXNE95uuYQYtt8
h7B1yNxEGzk/mLYYhL1k31/lnFt/9HDe3XOcmTGrzzsEyfyS/Rs=
=vQsk
-----END PGP SIGNATURE-----

--Apple-Mail=_5B6E5F61-8EF9-4DE3-806E-E887B9EB323B--