Commit f505754f authored Nov 14, 2018 by Filipe Manana Committed by David Sterba Nov 14, 2018

Btrfs: ensure path name is null terminated at btrfs_control_ioctl



We were using the path name received from user space without checking that
it is null terminated. While btrfs-progs is well behaved and does proper
validation and null termination, someone could call the ioctl and pass
a non-null terminated patch, leading to buffer overrun problems in the
kernel.  The ioctl is protected by CAP_SYS_ADMIN.

So just set the last byte of the path to a null character, similar to what
we do in other ioctls (add/remove/resize device, snapshot creation, etc).

CC: stable@vger.kernel.org # 4.4+
Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent aab15e8e

fs/btrfs/super.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -2237,6 +2237,7 @@ static long btrfs_control_ioctl(struct file *file, unsigned int cmd,
		vol = memdup_user((void __user )arg, sizeof(vol));
		if (IS_ERR(vol))
		return PTR_ERR(vol);
		vol->name[BTRFS_PATH_NAME_MAX] = '\0';

		switch (cmd) {
		case BTRFS_IOC_SCAN_DEV:

Admin message