]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
ubifs: report correct st_size for encrypted symlinks
authorEric Biggers <ebiggers@google.com>
Fri, 2 Jul 2021 06:53:49 +0000 (23:53 -0700)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 24 Sep 2021 09:59:00 +0000 (11:59 +0200)
BugLink: https://bugs.launchpad.net/bugs/1944610
commit 064c734986011390b4d111f1a99372b7f26c3850 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 ubifs_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: ca7f85be8d6c ("ubifs: Add support for encrypted symlinks")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210702065350.209646-5-ebiggers@kernel.org
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
fs/ubifs/file.c

index 2bc7780d2963c8f709d130a4626326fd03f045d0..33a64ec1822e7a34fbf0b7217aa2b5aed2533ef3 100644 (file)
@@ -1629,6 +1629,16 @@ static const char *ubifs_get_link(struct dentry *dentry,
        return fscrypt_get_symlink(inode, ui->data, ui->data_len, done);
 }
 
+static int ubifs_symlink_getattr(const struct path *path, struct kstat *stat,
+                                u32 request_mask, unsigned int query_flags)
+{
+       ubifs_getattr(path, stat, request_mask, query_flags);
+
+       if (IS_ENCRYPTED(d_inode(path->dentry)))
+               return fscrypt_symlink_getattr(path, stat);
+       return 0;
+}
+
 const struct address_space_operations ubifs_file_address_operations = {
        .readpage       = ubifs_readpage,
        .writepage      = ubifs_writepage,
@@ -1652,7 +1662,7 @@ const struct inode_operations ubifs_file_inode_operations = {
 const struct inode_operations ubifs_symlink_inode_operations = {
        .get_link    = ubifs_get_link,
        .setattr     = ubifs_setattr,
-       .getattr     = ubifs_getattr,
+       .getattr     = ubifs_symlink_getattr,
        .listxattr   = ubifs_listxattr,
        .update_time = ubifs_update_time,
 };