Patch "floppy: fix open(O_ACCMODE) for ioctl-only open" has been added to the 4.7-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
floppy: fix open(O_ACCMODE) for ioctl-only open
to the 4.7-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
floppy-fix-open-o_accmode-for-ioctl-only-open.patch
and it can be found in the queue-4.7 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
ff06db1efb2ad6db06eb5b99b88a0c15a9cc9b0eMon Sep 17 00:00:00 2001
From: Jiri Kosina <[email protected]>
Date: Thu, 16 Jun 2016 09:53:58 +0200
Subject: floppy: fix open(O_ACCMODE) for ioctl-only open
From: Jiri Kosina <[email protected]>
commit ff06db1efb2ad6db06eb5b99b88a0c15a9cc9b0e upstream.
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.
--- drivers/block/floppy.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-)
drivers/block/floppy.c +9 -12
@@ -3663,11 +3663,6 @@ static int floppy_open(struct block_devi opened_bdev[drive] = bdev; -if (!(mode & (FMODE_READ |FMODE_WRITE ))) { - res = -EINVAL ; - goto out; - } - res = -ENXIO ;if (!floppy_track_buffer) {
@@ -3711,13 +3706,15 @@ static int floppy_open(struct block_deviif (UFDCS ->rawcmd ==1 )UFDCS ->rawcmd =2 ; -UDRS ->last_checked =0 ; -clear_bit (FD_OPEN_SHOULD_FAIL_BIT , &UDRS ->flags); -check_disk_change (bdev); -if (test_bit (FD_DISK_CHANGED_BIT , &UDRS ->flags)) - goto out; -if (test_bit (FD_OPEN_SHOULD_FAIL_BIT , &UDRS ->flags)) - goto out; +if (mode & (FMODE_READ |FMODE_WRITE )) { +UDRS ->last_checked =0 ; +clear_bit (FD_OPEN_SHOULD_FAIL_BIT , &UDRS ->flags); +check_disk_change (bdev); +if (test_bit (FD_DISK_CHANGED_BIT , &UDRS ->flags)) + goto out; +if (test_bit (FD_OPEN_SHOULD_FAIL_BIT , &UDRS ->flags)) + goto out; + } res = -EROFS ;
Patches currently in stable-queue which might be from [email protected] are
queue-4.7/floppy-fix-open-o_accmode-for-ioctl-only-open.patch queue-4.7/hid-uhid-fix-timeout-when-probe-races-with-io.patch