Re: [PATCH 4.7 114/143] Revert "floppy: fix open(O_ACCMODE) for ioctl-only open"

[Mark Hounschell]

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@xxxxxx>
>
> commit 468c298ad3ed3f0d94a65f8ca00f6bfc6c2b4e33 upstream.
>
> This reverts commit ff06db1efb2ad6db06eb5b99b88a0c15a9cc9b0e.
>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
>
> ---
>  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