Kernel/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-07 13:53:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fscrypt: explicitly require that inode->i_blkbits be set

Browse Source 
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>
This commit is contained in:
Xiubo Li 2024-02-01 08:35:25 +08:00 committed by Eric Biggers
parent 41bccc98fb
commit 5befc19cae
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fs/crypto/keysetup.c
View File

@ -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 * fscrypt_prepare_new_inode() - prepare to create a new inode in a directory
* @dir: a possibly-encrypted 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. * ->i_ino doesn't need to be set yet.
* @encrypt_ret: (output) set to %true if the new inode will be encrypted * @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)) if (IS_ERR(policy))
return PTR_ERR(policy); return PTR_ERR(policy);
if (WARN_ON_ONCE(inode->i_blkbits == 0))
return -EINVAL;
if (WARN_ON_ONCE(inode->i_mode == 0)) if (WARN_ON_ONCE(inode->i_mode == 0))
return -EINVAL; return -EINVAL;