[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20240201003525.1788594-1-xiubli@redhat.com>
Date: Thu, 1 Feb 2024 08:35:25 +0800
From: xiubli@...hat.com
To: linux-fscrypt@...r.kernel.org
Cc: ebiggers@...nel.org,
tytso@....edu,
jaegeuk@...nel.org,
linux-kernel@...r.kernel.org,
idryomov@...il.com,
ceph-devel@...r.kernel.org,
jlayton@...nel.org,
vshankar@...hat.com,
mchangir@...hat.com,
Xiubo Li <xiubli@...hat.com>
Subject: [PATCH v2] fscrypt: to make sure the inode->i_blkbits is correctly set
From: Xiubo Li <xiubli@...hat.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@...hat.com>
---
V2:
- Fixed the comments suggested by Eric, thanks.
fs/crypto/keysetup.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
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;
--
2.43.0
Powered by blists - more mailing lists