diff mbox series

[v2] fscrypt: to make sure the inode->i_blkbits is correctly set

Message ID 20240201003525.1788594-1-xiubli@redhat.com
State New
Headers
Series [v2] fscrypt: to make sure the inode->i_blkbits is correctly set |

Commit Message

Xiubo Li Feb. 1, 2024, 12:35 a.m. UTC 
  From: Xiubo Li <xiubli@redhat.com>

The inode->i_blkbits should be already set before calling
fscrypt_get_encryption_info() and it will use this to setup the
ci_data_unit_bits later.

URL: https://tracker.ceph.com/issues/64035
Signed-off-by: Xiubo Li <xiubli@redhat.com>
---

V2:
- Fixed the comments suggested by Eric, thanks.



 fs/crypto/keysetup.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Eric Biggers Feb. 1, 2024, 2:48 a.m. UTC | #1 
On Thu, Feb 01, 2024 at 08:35:25AM +0800, xiubli@redhat.com wrote:
> From: Xiubo Li <xiubli@redhat.com>
> 
> The inode->i_blkbits should be already set before calling
> fscrypt_get_encryption_info() and it will use this to setup the
> ci_data_unit_bits later.
> 
> URL: https://tracker.ceph.com/issues/64035
> Signed-off-by: Xiubo Li <xiubli@redhat.com>

Thanks, applied.  I adjusted the commit message to make it clear what the patch
actually does:

commit 5befc19caec93f0088595b4d28baf10658c27a0f
Author: Xiubo Li <xiubli@redhat.com>
Date:   Thu Feb 1 08:35:25 2024 +0800

    fscrypt: explicitly require that inode->i_blkbits be set

    Document that fscrypt_prepare_new_inode() requires inode->i_blkbits to
    be set, and make it WARN if it's not.  This would have made the CephFS
    bug https://tracker.ceph.com/issues/64035 a bit easier to debug.

    Signed-off-by: Xiubo Li <xiubli@redhat.com>
    Link: https://lore.kernel.org/r/20240201003525.1788594-1-xiubli@redhat.com
    Signed-off-by: Eric Biggers <ebiggers@google.com>
Xiubo Li Feb. 1, 2024, 2:59 a.m. UTC | #2 
On 2/1/24 10:48, Eric Biggers wrote:
> On Thu, Feb 01, 2024 at 08:35:25AM +0800, xiubli@redhat.com wrote:
>> From: Xiubo Li <xiubli@redhat.com>
>>
>> The inode->i_blkbits should be already set before calling
>> fscrypt_get_encryption_info() and it will use this to setup the
>> ci_data_unit_bits later.
>>
>> URL: https://tracker.ceph.com/issues/64035
>> Signed-off-by: Xiubo Li <xiubli@redhat.com>
> Thanks, applied.  I adjusted the commit message to make it clear what the patch
> actually does:
>
> commit 5befc19caec93f0088595b4d28baf10658c27a0f
> Author: Xiubo Li <xiubli@redhat.com>
> Date:   Thu Feb 1 08:35:25 2024 +0800
>
>      fscrypt: explicitly require that inode->i_blkbits be set
>
>      Document that fscrypt_prepare_new_inode() requires inode->i_blkbits to
>      be set, and make it WARN if it's not.  This would have made the CephFS
>      bug https://tracker.ceph.com/issues/64035 a bit easier to debug.
>
>      Signed-off-by: Xiubo Li <xiubli@redhat.com>
>      Link: https://lore.kernel.org/r/20240201003525.1788594-1-xiubli@redhat.com
>      Signed-off-by: Eric Biggers <ebiggers@google.com>
>
Ack, thanks Eric.

- Xiubo
diff mbox series

Patch

diff --git a/fs/crypto/keysetup.c b/fs/crypto/keysetup.c
index d71f7c799e79..9a0a40c81bf2 100644
--- a/fs/crypto/keysetup.c
+++ b/fs/crypto/keysetup.c
@@ -687,7 +687,7 @@  int fscrypt_get_encryption_info(struct inode *inode, bool allow_unsupported)
 /**
  * fscrypt_prepare_new_inode() - prepare to create a new inode in a directory
  * @dir: a possibly-encrypted directory
- * @inode: the new inode.  ->i_mode must be set already.
+ * @inode: the new inode.  ->i_mode and ->i_blkbits must be set already.
  *	   ->i_ino doesn't need to be set yet.
  * @encrypt_ret: (output) set to %true if the new inode will be encrypted
  *
@@ -717,6 +717,9 @@  int fscrypt_prepare_new_inode(struct inode *dir, struct inode *inode,
 	if (IS_ERR(policy))
 		return PTR_ERR(policy);
 
+	if (WARN_ON_ONCE(inode->i_blkbits == 0))
+		return -EINVAL;
+
 	if (WARN_ON_ONCE(inode->i_mode == 0))
 		return -EINVAL;