Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1478507
| From | Mark Hounschell <markh@compro.net> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | Re: [PATCH 4.7 114/143] Revert "floppy: fix open(O_ACCMODE) for ioctl-only open" |
| Date | 2016-09-07 19:00 +0200 |
| Message-ID | <seOmC-2g5-13@gated-at.bofh.it> (permalink) |
| References | <se5fP-6h4-11@gated-at.bofh.it> <se5pC-6lQ-71@gated-at.bofh.it> |
| Organization | Compro Computer Svcs. |
On 09/05/2016 12:44 PM, Greg Kroah-Hartman wrote:
> 4.7-stable review patch. If anyone has any objections, please let me know.
>
> ------------------
>
> From: Jens Axboe <axboe@fb.com>
>
> commit 468c298ad3ed3f0d94a65f8ca00f6bfc6c2b4e33 upstream.
>
> This reverts commit ff06db1efb2ad6db06eb5b99b88a0c15a9cc9b0e.
>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
> drivers/block/floppy.c | 21 ++++++++++++---------
> 1 file changed, 12 insertions(+), 9 deletions(-)
>
> --- a/drivers/block/floppy.c
> +++ b/drivers/block/floppy.c
> @@ -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_devi
> if (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;
>
>
>
>
Can I assume the one to revert 09954bad448791ef01202351d437abdd9497a804
will be a separate one?
Thanks
Mark
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH 4.7 114/143] Revert "floppy: fix open(O_ACCMODE) for ioctl-only open" Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-09-05 19:00 +0200
Re: [PATCH 4.7 114/143] Revert "floppy: fix open(O_ACCMODE) for ioctl-only open" Mark Hounschell <markh@compro.net> - 2016-09-07 19:00 +0200
Re: [PATCH 4.7 114/143] Revert "floppy: fix open(O_ACCMODE) for ioctl-only open" Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-09-08 09:00 +0200
Re: [PATCH 4.7 114/143] Revert "floppy: fix open(O_ACCMODE) for ioctl-only open" Jiri Kosina <jikos@kernel.org> - 2016-09-08 10:10 +0200
Re: [PATCH 4.7 114/143] Revert "floppy: fix open(O_ACCMODE) for ioctl-only open" Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-09-09 13:40 +0200
csiph-web