Patch "Revert "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
Revert "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:
revert-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
468c298ad3ed3f0d94a65f8ca00f6bfc6c2b4e33Mon Sep 17 00:00:00 2001
From: Jens Axboe <[email protected]>
Date: Thu, 25 Aug 2016 08:56:44 -0600
Subject: Revert "floppy: fix open(O_ACCMODE) for ioctl-only open"
From: Jens Axboe <[email protected]>
commit 468c298ad3ed3f0d94a65f8ca00f6bfc6c2b4e33 upstream.
This reverts commit ff06db1efb2ad6db06eb5b99b88a0c15a9cc9b0e.
--- drivers/block/floppy.c | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-)
drivers/block/floppy.c +12 -9
@@ -3663,6 +3663,11 @@ 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) {
@@ -3706,15 +3711,13 @@ static int floppy_open(struct block_deviif (UFDCS ->rawcmd ==1 )UFDCS ->rawcmd =2 ; -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; - } +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/genirq-msi-remove-unused-msi_flag_identity_map.patch queue-4.7/revert-floppy-fix-open-o_accmode-for-ioctl-only-open.patch