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: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>

diff --git a/fs/f2fs/crypto_fname.c b/fs/f2fs/crypto_fname.c
index e7aa67c3772e87d913bb291e0142fc958e375dff..905c06535c2a54a4b5e7282a385fcafa14186a7d 100644 (file)
--- a/fs/f2fs/crypto_fname.c
+++ b/fs/f2fs/crypto_fname.c
@@ -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);