]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
floppy: fix out-of-bounds read in next_valid_format
authorDenis Efremov <efremov@ispras.ru>
Fri, 12 Jul 2019 18:55:21 +0000 (21:55 +0300)
committerBen Hutchings <ben@decadent.org.uk>
Tue, 13 Aug 2019 11:39:26 +0000 (12:39 +0100)
commit59fbdf8b65a4f09d8043dded8a4b8e0d603eee27
treedc3cc452b61fb3fda917be15017e5fef21a1c9d4
parenta36b6459cbff32a0ef228241c99d6586ca7e944c
floppy: fix out-of-bounds read in next_valid_format

commit 5635f897ed83fd539df78e98ba69ee91592f9bb8 upstream.

This fixes a global out-of-bounds read access in the next_valid_format
function of the floppy driver.

The values from autodetect field of the struct floppy_drive_params are
used as indices for the floppy_type array in the next_valid_format
function 'floppy_type[DP->autodetect[probed_format]].sect'.

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

CAP_SYS_ADMIN is required to call FDSETDRVPRM.

The patch adds the check for values of the autodetect 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