From: "Moritz Müller" <moritzm.mueller@posteo.de>
To: linux-kernel@vger.kernel.org, linux-block@vger.kernel.org,
linux-kernel@i4.cs.fau.de
Cc: "Moritz Müller" <moritzm.mueller@posteo.de>,
"Philip K ." <philip@warpmail.net>
Subject: [PATCH v3] floppy: hide invalid floppy disk types
Date: Mon, 9 Dec 2019 10:32:59 +0100 [thread overview]
Message-ID: <20191209093258.14319-1-moritzm.mueller@posteo.de> (raw)
In-Reply-To: <d3f0613c-6c3a-8efc-1c27-a6b75c34972f@gmail.com>
In some cases floppy disks are being indexed, even though no actual
device exists. In our case this was caused by the CMOS-RAM having a few
peculiar bits. This caused a non-existent floppy disk of the type 13 (in
our case) to be registered as an possibly mountable device, even though
it could not be mounted by any user.
We believe this to be an instance of this bug:
https://bugzilla.kernel.org/show_bug.cgi?id=13486
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/384579
This patch adds the option FLOPPY_ALLOW_UNKNOWN_TYPES to prevent the
additional check that fixed the issue on our reference system, and
increases the startup time of affected systems by over a minute.
Co-developed-by: Philip K. <philip@warpmail.net>
Signed-off-by: Philip K. <philip@warpmail.net>
Signed-off-by: Moritz Müller <moritzm.mueller@posteo.de>
---
drivers/block/Kconfig | 10 ++++++++++
drivers/block/floppy.c | 6 ++++++
2 files changed, 16 insertions(+)
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 1bb8ec575352..9e6b32c50b67 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -72,6 +72,16 @@ config AMIGA_Z2RAM
To compile this driver as a module, choose M here: the
module will be called z2ram.
+config FLOPPY_ALLOW_UNKNOWN_TYPES
+ bool "Allow floppy disks of unknown type to be registered."
+ default n
+ help
+ Select this option if you want the Kernel to register floppy
+ disks of an unknown type.
+
+ This should usually not be enabled, because of cases where the
+ system falsely recognizes a non-existent floppy disk as mountable.
+
config CDROM
tristate
select BLK_SCSI_REQUEST
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 485865fd0412..9439444d46d0 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -3949,7 +3949,11 @@ static void __init config_types(void)
} else
allowed_drive_mask &= ~(1 << drive);
} else {
+#ifdef CONFIG_FLOPPY_ALLOW_UNKNOWN_TYPES
params = &default_drive_params[0].params;
+#else
+ params = UDP;
+#endif
snprintf(temparea, sizeof(temparea),
"unknown type %d (usb?)", type);
name = temparea;
@@ -4518,7 +4520,10 @@ static bool floppy_available(int drive)
return false;
if (fdc_state[FDC(drive)].version == FDC_NONE)
return false;
+#ifndef CONFIG_FLOPPY_ALLOW_UNKNOWN_TYPES
+ if (UDP->cmos >= ARRAY_SIZE(default_drive_params))
+ return false;
+#endif
return true;
}
--
2.20.1
next prev parent reply other threads:[~2019-12-09 9:34 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-08 19:45 [PATCH] floppy: hide invalid floppy disk types Moritz Müller
2019-12-08 20:16 ` Denis Efremov
2019-12-09 9:32 ` Moritz Müller [this message]
2019-12-09 17:03 ` [PATCH v3] " Denis Efremov
[not found] ` <87h82ajzqd.fsf@bulbul>
2019-12-09 17:04 ` [PATCH] " Denis Efremov
2019-12-09 17:30 ` Philip K.
2019-12-09 0:32 ` kbuild test robot
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191209093258.14319-1-moritzm.mueller@posteo.de \
--to=moritzm.mueller@posteo.de \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@i4.cs.fau.de \
--cc=linux-kernel@vger.kernel.org \
--cc=philip@warpmail.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).