From: Linus Torvalds Date: Thu, 18 Jul 2019 15:43:20 +0000 (-0700) Subject: Merge branch 'floppy' X-Git-Tag: v5.4-rc1~526 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47d6a7607443ea43dbc4d0f371bf773540a8f8f4;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'floppy' Merge floppy ioctl verification fixes from Denis Efremov. This also marks the floppy driver as orphaned - it turns out that Jiri no longer has working hardware. Actual working physical floppy hardware is getting hard to find, and while Willy was able to test this, I think the driver can be considered pretty much dead from an actual hardware standpoint. The hardware that is still sold seems to be mainly USB-based, which doesn't use this legacy driver at all. The old floppy disk controller is still emulated in various VM environments, so the driver isn't going away, but let's see if anybody is interested to step up to maintain it. The lack of hardware also likely means that the ioctl range verification fixes are probably mostly relevant to anybody using floppies in a virtual environment. Which is probably also going away in favor of USB storage emulation, but who knows. Will Decon reviewed the patches but I'm not rebasing them just for that, so I'll add a Reviewed-by: Will Deacon here instead. * floppy: MAINTAINERS: mark floppy.c orphaned floppy: fix out-of-bounds read in copy_buffer floppy: fix invalid pointer dereference in drive_name floppy: fix out-of-bounds read in next_valid_format floppy: fix div-by-zero in setup_format_params --- 47d6a7607443ea43dbc4d0f371bf773540a8f8f4 diff --cc MAINTAINERS index ce06877,60c84be..0d0d5c0 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -6312,18 -6228,9 +6312,17 @@@ M: Philip Kelleher +L: linux-iio@vger.kernel.org +S: Maintained +F: Documentation/ABI/testing/sysfs-bus-counter-ftm-quadddec +F: Documentation/devicetree/bindings/counter/ftm-quaddec.txt +F: drivers/counter/ftm-quaddec.c + FLOPPY DRIVER - M: Jiri Kosina - T: git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/floppy.git - S: Odd fixes + S: Orphan + L: linux-block@vger.kernel.org F: drivers/block/floppy.c FMC SUBSYSTEM