]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
f2fs: report correct st_size for encrypted symlinks
authorEric Biggers <ebiggers@google.com>
Wed, 8 Sep 2021 21:50:32 +0000 (14:50 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 22 Sep 2021 09:47:56 +0000 (11:47 +0200)
commit 461b43a8f92e68e96c4424b31e15f2b35f1bbfa9 upstream.

The stat() family of syscalls report the wrong size for encrypted
symlinks, which has caused breakage in several userspace programs.

Fix this by calling fscrypt_symlink_getattr() after f2fs_getattr() for
encrypted symlinks.  This function computes the correct size by reading
and decrypting the symlink target (if it's not already cached).

For more details, see the commit which added fscrypt_symlink_getattr().

Fixes: cbaf042a3cc6 ("f2fs crypto: add symlink encryption")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210702065350.209646-4-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/f2fs/namei.c

index e20a0f9e68455b75c68d6d63f7a380ccaf249e15..edc80855974ace21adb06819467e1426df882039 100644 (file)
@@ -1219,9 +1219,18 @@ static const char *f2fs_encrypted_get_link(struct dentry *dentry,
        return target;
 }
 
+static int f2fs_encrypted_symlink_getattr(const struct path *path,
+                                         struct kstat *stat, u32 request_mask,
+                                         unsigned int query_flags)
+{
+       f2fs_getattr(path, stat, request_mask, query_flags);
+
+       return fscrypt_symlink_getattr(path, stat);
+}
+
 const struct inode_operations f2fs_encrypted_symlink_inode_operations = {
        .get_link       = f2fs_encrypted_get_link,
-       .getattr        = f2fs_getattr,
+       .getattr        = f2fs_encrypted_symlink_getattr,
        .setattr        = f2fs_setattr,
 #ifdef CONFIG_F2FS_FS_XATTR
        .listxattr      = f2fs_listxattr,