]> www.infradead.org Git - users/dwmw2/linux.git/commit
floppy: fix invalid pointer dereference in drive_name
authorDenis Efremov <efremov@ispras.ru>
Fri, 12 Jul 2019 18:55:22 +0000 (21:55 +0300)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 13 Aug 2019 11:39:26 +0000 (12:39 +0100)
commitfbf6a95d0a3d410ee2f4530e243b77beee87c76a
tree9066552e20bb38ab12b6b61c0f07bee2775a8bcf
parent59fbdf8b65a4f09d8043dded8a4b8e0d603eee27
floppy: fix invalid pointer dereference in drive_name

commit 9b04609b784027968348796a18f601aed9db3789 upstream.

This fixes the invalid pointer dereference in the drive_name function of
the floppy driver.

The native_format field of the struct floppy_drive_params is used as
floppy_type array index in the drive_name function.  Thus, the field
should be checked the same way as the autodetect field.

To trigger the bug, one could use a value out of range and set the drive
parameters with the FDSETDRVPRM ioctl.  Next, FDGETDRVTYP ioctl should
be used to call the drive_name.  A floppy disk is not required to be
inserted.

CAP_SYS_ADMIN is required to call FDSETDRVPRM.

The patch adds the check for a value of the native_format field to be in
the '0 <= x < ARRAY_SIZE(floppy_type)' range of the floppy_type array
indices.

The bug was found by syzkaller.

Signed-off-by: Denis Efremov <efremov@ispras.ru>
Tested-by: Willy Tarreau <w@1wt.eu>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
[bwh: Backported to 3.16: Drop changes in compat_setdrvprm(), as compat
 ioctls go via fd_ioctl_locked() after translation in compat_ioctl.c.]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
drivers/block/floppy.c