]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
btrfs: don't skip accounting in early ENOTTY return in btrfs_uring_encoded_read()
authorCaleb Sander Mateos <csander@purestorage.com>
Thu, 19 Jun 2025 19:27:45 +0000 (13:27 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 20 Aug 2025 16:41:39 +0000 (18:41 +0200)
commit ea124ec327086325fc096abf42837dac471ac7ae upstream.

btrfs_uring_encoded_read() returns early with -ENOTTY if the uring_cmd
is issued with IO_URING_F_COMPAT but the kernel doesn't support compat
syscalls. However, this early return bypasses the syscall accounting.
Go to out_acct instead to ensure the syscall is counted.

Fixes: 34310c442e17 ("btrfs: add io_uring command for encoded reads (ENCODED_READ ioctl)")
CC: stable@vger.kernel.org # 6.15+
Signed-off-by: Caleb Sander Mateos <csander@purestorage.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/btrfs/ioctl.c

index 8a60983a697c650922a57201661611ac927935f1..36e485d845308c5960d2389a9ae5b429fca919d5 100644 (file)
@@ -4829,7 +4829,8 @@ static int btrfs_uring_encoded_read(struct io_uring_cmd *cmd, unsigned int issue
 #if defined(CONFIG_64BIT) && defined(CONFIG_COMPAT)
                copy_end = offsetofend(struct btrfs_ioctl_encoded_io_args_32, flags);
 #else
-               return -ENOTTY;
+               ret = -ENOTTY;
+               goto out_acct;
 #endif
        } else {
                copy_end = copy_end_kernel;