From: <gregkh@linuxfoundation.org> To: ebiggers@google.com, ebiggers@kernel.org, gregkh@linuxfoundation.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org Cc: stable-commits@vger.kernel.org Subject: [f2fs-dev] Patch "ubifs: report correct st_size for encrypted symlinks" has been added to the 5.4-stable tree Date: Fri, 03 Sep 2021 15:58:16 +0200 [thread overview] Message-ID: <163067749626136@kroah.com> (raw) In-Reply-To: <20210901164041.176238-5-ebiggers@kernel.org> This is a note to let you know that I've just added the patch titled ubifs: report correct st_size for encrypted symlinks to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ubifs-report-correct-st_size-for-encrypted-symlinks.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. From foo@baz Fri Sep 3 03:56:23 PM CEST 2021 From: Eric Biggers <ebiggers@kernel.org> Date: Wed, 1 Sep 2021 09:40:41 -0700 Subject: ubifs: report correct st_size for encrypted symlinks To: stable@vger.kernel.org Cc: linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org Message-ID: <20210901164041.176238-5-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> 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> --- fs/ubifs/file.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -1629,6 +1629,16 @@ static const char *ubifs_get_link(struct 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, @@ -1654,7 +1664,7 @@ const struct inode_operations ubifs_file const struct inode_operations ubifs_symlink_inode_operations = { .get_link = ubifs_get_link, .setattr = ubifs_setattr, - .getattr = ubifs_getattr, + .getattr = ubifs_symlink_getattr, #ifdef CONFIG_UBIFS_FS_XATTR .listxattr = ubifs_listxattr, #endif Patches currently in stable-queue which might be from ebiggers@kernel.org are queue-5.4/ubifs-report-correct-st_size-for-encrypted-symlinks.patch queue-5.4/ext4-report-correct-st_size-for-encrypted-symlinks.patch queue-5.4/fscrypt-add-fscrypt_symlink_getattr-for-computing-st_size.patch queue-5.4/f2fs-report-correct-st_size-for-encrypted-symlinks.patch _______________________________________________ Linux-f2fs-devel mailing list Linux-f2fs-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
WARNING: multiple messages have this Message-ID (diff)
From: <gregkh@linuxfoundation.org> To: ebiggers@google.com, ebiggers@kernel.org, gregkh@linuxfoundation.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org Cc: <stable-commits@vger.kernel.org> Subject: Patch "ubifs: report correct st_size for encrypted symlinks" has been added to the 5.4-stable tree Date: Fri, 03 Sep 2021 15:58:16 +0200 [thread overview] Message-ID: <163067749626136@kroah.com> (raw) In-Reply-To: <20210901164041.176238-5-ebiggers@kernel.org> This is a note to let you know that I've just added the patch titled ubifs: report correct st_size for encrypted symlinks to the 5.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: ubifs-report-correct-st_size-for-encrypted-symlinks.patch and it can be found in the queue-5.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let <stable@vger.kernel.org> know about it. From foo@baz Fri Sep 3 03:56:23 PM CEST 2021 From: Eric Biggers <ebiggers@kernel.org> Date: Wed, 1 Sep 2021 09:40:41 -0700 Subject: ubifs: report correct st_size for encrypted symlinks To: stable@vger.kernel.org Cc: linux-fscrypt@vger.kernel.org, linux-ext4@vger.kernel.org, linux-f2fs-devel@lists.sourceforge.net, linux-mtd@lists.infradead.org Message-ID: <20210901164041.176238-5-ebiggers@kernel.org> From: Eric Biggers <ebiggers@google.com> 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> --- fs/ubifs/file.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) --- a/fs/ubifs/file.c +++ b/fs/ubifs/file.c @@ -1629,6 +1629,16 @@ static const char *ubifs_get_link(struct 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, @@ -1654,7 +1664,7 @@ const struct inode_operations ubifs_file const struct inode_operations ubifs_symlink_inode_operations = { .get_link = ubifs_get_link, .setattr = ubifs_setattr, - .getattr = ubifs_getattr, + .getattr = ubifs_symlink_getattr, #ifdef CONFIG_UBIFS_FS_XATTR .listxattr = ubifs_listxattr, #endif Patches currently in stable-queue which might be from ebiggers@kernel.org are queue-5.4/ubifs-report-correct-st_size-for-encrypted-symlinks.patch queue-5.4/ext4-report-correct-st_size-for-encrypted-symlinks.patch queue-5.4/fscrypt-add-fscrypt_symlink_getattr-for-computing-st_size.patch queue-5.4/f2fs-report-correct-st_size-for-encrypted-symlinks.patch ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
next prev parent reply other threads:[~2021-09-03 13:58 UTC|newest] Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-01 16:40 [PATCH 5.4 0/4] backport fscrypt symlink fixes to 5.4 Eric Biggers 2021-09-01 16:40 ` Eric Biggers 2021-09-01 16:40 ` [f2fs-dev] " Eric Biggers 2021-09-01 16:40 ` [PATCH 5.4 1/4] fscrypt: add fscrypt_symlink_getattr() for computing st_size Eric Biggers 2021-09-01 16:40 ` Eric Biggers 2021-09-01 16:40 ` [f2fs-dev] " Eric Biggers 2021-09-03 13:58 ` [f2fs-dev] Patch "fscrypt: add fscrypt_symlink_getattr() for computing st_size" has been added to the 5.4-stable tree gregkh 2021-09-03 13:58 ` gregkh 2021-09-01 16:40 ` [PATCH 5.4 2/4] ext4: report correct st_size for encrypted symlinks Eric Biggers 2021-09-01 16:40 ` Eric Biggers 2021-09-01 16:40 ` [f2fs-dev] " Eric Biggers 2021-09-03 13:58 ` [f2fs-dev] Patch "ext4: report correct st_size for encrypted symlinks" has been added to the 5.4-stable tree gregkh 2021-09-03 13:58 ` gregkh 2021-09-01 16:40 ` [PATCH 5.4 3/4] f2fs: report correct st_size for encrypted symlinks Eric Biggers 2021-09-01 16:40 ` Eric Biggers 2021-09-01 16:40 ` [f2fs-dev] " Eric Biggers 2021-09-03 13:58 ` [f2fs-dev] Patch "f2fs: report correct st_size for encrypted symlinks" has been added to the 5.4-stable tree gregkh 2021-09-03 13:58 ` gregkh 2021-09-01 16:40 ` [PATCH 5.4 4/4] ubifs: report correct st_size for encrypted symlinks Eric Biggers 2021-09-01 16:40 ` Eric Biggers 2021-09-01 16:40 ` [f2fs-dev] " Eric Biggers 2021-09-03 13:58 ` gregkh [this message] 2021-09-03 13:58 ` Patch "ubifs: report correct st_size for encrypted symlinks" has been added to the 5.4-stable tree gregkh 2021-09-03 13:57 ` [PATCH 5.4 0/4] backport fscrypt symlink fixes to 5.4 Greg KH 2021-09-03 13:57 ` [f2fs-dev] " Greg KH 2021-09-03 13:57 ` Greg KH
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=163067749626136@kroah.com \ --to=gregkh@linuxfoundation.org \ --cc=ebiggers@google.com \ --cc=ebiggers@kernel.org \ --cc=linux-f2fs-devel@lists.sourceforge.net \ --cc=linux-mtd@lists.infradead.org \ --cc=stable-commits@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.