e2fsck: fix reading fscrypt_symlink_data.len

The ciphertext length field stored at the beginning of encrypted symlink
targets is 16-bit.  But e2fsck_pass1_check_symlink() is reading it as
32-bit.  This was apparently left over from an earlier on-disk format
that was not merged.  Fix it.

This bug caused a small proportion of encrypted symlinks with 4092-byte
targets to be considered invalid by e2fsck, but otherwise had no effect.

Fixes: 62ad24802c6e ("e2fsck: handle encrypted directories which are indexed using htree")
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>

diff --git a/e2fsck/pass1.c b/e2fsck/pass1.c
index 7a82536dde57feb7b59e9b6e4c23d6d4279c9125..421fa284a416c46037d317c19fd41f9241d98565 100644 (file)
--- a/e2fsck/pass1.c
+++ b/e2fsck/pass1.c
@@ -239,7 +239,7 @@ int e2fsck_pass1_check_symlink(ext2_filsys fs, ext2_ino_t ino,
                        return 0;
 
                if (inode->i_flags & EXT4_ENCRYPT_FL) {
-                       len = ext2fs_le32_to_cpu(*((__u32 *)buf)) + 4;
+                       len = ext2fs_le16_to_cpu(*((__u16 *)buf)) + 2;
                } else {
                        len = strnlen(buf, fs->blocksize);
                }