Commit 1dafa51d authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs crypto: check for too-short encrypted file names

This patch adopts:
	ext4 crypto: check for too-short encrypted file names

An encrypted file name should never be shorter than an 16 bytes, the
AES block size.  The 3.10 crypto layer will oops and crash the kernel
if ciphertext shorter than the block size is passed to it.

Fortunately, in modern kernels the crypto layer will not crash the
kernel in this scenario, but nevertheless, it represents a corrupted
directory, and we should detect it and mark the file system as
corrupted so that e2fsck can fix this.
Signed-off-by: default avatarTheodore Ts'o <>
Signed-off-by: default avatarJaegeuk Kim <>
parent ce855a3b
......@@ -317,7 +317,10 @@ int f2fs_fname_disk_to_usr(struct inode *inode,
oname->len = iname->len;
return oname->len;
if (iname->len < F2FS_CRYPTO_BLOCK_SIZE) {
printk("encrypted inode too small");
return -EUCLEAN;
if (F2FS_I(inode)->i_crypt_info)
return f2fs_fname_decrypt(inode, iname, oname);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment