Commit 973e57c7 authored by Yochai Eisenrich's avatar Yochai Eisenrich Committed by David Sterba
Browse files

btrfs: fix btrfs_ioctl_space_info() slot_count TOCTOU which can lead to info-leak 



btrfs_ioctl_space_info() has a TOCTOU race between two passes over the
block group RAID type lists. The first pass counts entries to determine
the allocation size, then the second pass fills the buffer. The
groups_sem rwlock is released between passes, allowing concurrent block
group removal to reduce the entry count.

When the second pass fills fewer entries than the first pass counted,
copy_to_user() copies the full alloc_size bytes including trailing
uninitialized kmalloc bytes to userspace.

Fix by copying only total_spaces entries (the actually-filled count from
the second pass) instead of alloc_size bytes, and switch to kzalloc so
any future copy size mismatch cannot leak heap data.

Fixes: 7fde62bf ("Btrfs: buffer results in the space_info ioctl")
CC: stable@vger.kernel.org # 3.0
Signed-off-by: default avatarYochai Eisenrich <echelonh@gmail.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent cee4cfd6

fs/btrfs/ioctl.c

+3 −2
Original line number Diff line number Diff line
@@ -2897,7 +2897,7 @@ static long btrfs_ioctl_space_info(struct btrfs_fs_info *fs_info, 
		return -ENOMEM;



	space_args.total_spaces = 0;

	dest = kmalloc(alloc_size, GFP_KERNEL);

	dest = kzalloc(alloc_size, GFP_KERNEL);

	if (!dest)

		return -ENOMEM;

	dest_orig = dest;
@@ -2953,7 +2953,8 @@ static long btrfs_ioctl_space_info(struct btrfs_fs_info *fs_info, 
	user_dest = (struct btrfs_ioctl_space_info __user *)

		(arg + sizeof(struct btrfs_ioctl_space_args));



	if (copy_to_user(user_dest, dest_orig, alloc_size))

	if (copy_to_user(user_dest, dest_orig,

		 space_args.total_spaces * sizeof(*dest_orig)))

		return -EFAULT;



out: