Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f502ef68 authored by Jiri Kosina's avatar Jiri Kosina Committed by Greg Kroah-Hartman
Browse files

floppy: reintroduce O_NDELAY fix 

commit 8a0c014cd20516ade9654fc13b51345ec58e7be8 upstream.

This issue was originally fixed in 09954bad4 ("floppy: refactor open()
flags handling").

The fix as a side-effect, however, introduce issue for open(O_ACCMODE)
that is being used for ioctl-only open. I wrote a fix for that, but
instead of it being merged, full revert of 09954bad4 was performed,
re-introducing the O_NDELAY / O_NONBLOCK issue, and it strikes again.

This is a forward-port of the original fix to current codebase; the
original submission had the changelog below:

====
Commit 09954bad4 ("floppy: refactor open() flags handling"), as a
side-effect, causes open(/dev/fdX, O_ACCMODE) to fail. It turns out that
this is being used setfdprm userspace for ioctl-only open().

Reintroduce back the original behavior wrt !(FMODE_READ|FMODE_WRITE)
modes, while still keeping the original O_NDELAY bug fixed.

Link: https://lore.kernel.org/r/nycvar.YFH.7.76.2101221209060.5622@cbobk.fhfr.pm


Cc: stable@vger.kernel.org
Reported-by: default avatarWim Osterholt <wim@djo.tudelft.nl>
Tested-by: default avatarWim Osterholt <wim@djo.tudelft.nl>
Reported-and-tested-by: default avatarKurt Garloff <kurt@garloff.de>
Fixes: 09954bad4 ("floppy: refactor open() flags handling")
Fixes: f2791e7ead ("Revert "floppy: refactor open() flags handling"")
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a6d4fc8c

drivers/block/floppy.c

+14 −13
Original line number Diff line number Diff line
@@ -4066,7 +4066,6 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 
	if (UFDCS->rawcmd == 1)

		UFDCS->rawcmd = 2;



	if (!(mode & FMODE_NDELAY)) {

	if (mode & (FMODE_READ|FMODE_WRITE)) {

		UDRS->last_checked = 0;

		clear_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags);
@@ -4076,11 +4075,13 @@ static int floppy_open(struct block_device *bdev, fmode_t mode) 
		if (test_bit(FD_OPEN_SHOULD_FAIL_BIT, &UDRS->flags))

			goto out;

	}



	res = -EROFS;



	if ((mode & FMODE_WRITE) &&

			!test_bit(FD_DISK_WRITABLE_BIT, &UDRS->flags))

		goto out;

	}



	mutex_unlock(&open_lock);

	mutex_unlock(&floppy_mutex);

	return 0;