From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756053AbcIGQxz (ORCPT ); Wed, 7 Sep 2016 12:53:55 -0400 Received: from smtp129.dfw.emailsrvr.com ([67.192.241.129]:52874 "EHLO smtp129.dfw.emailsrvr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751038AbcIGQxx (ORCPT ); Wed, 7 Sep 2016 12:53:53 -0400 X-SMTPDoctor-Processed: csmtpprox beta X-Auth-ID: markh@compro.net X-Sender-Id: markh@compro.net Reply-To: markh@compro.net Subject: Re: [PATCH 4.7 114/143] Revert "floppy: fix open(O_ACCMODE) for ioctl-only open" References: <20160905164430.593075551@linuxfoundation.org> <20160905164435.446877600@linuxfoundation.org> To: Greg Kroah-Hartman , linux-kernel@vger.kernel.org Cc: stable@vger.kernel.org, Jens Axboe , "jikos@kernel.org >> Jiri Kosina" From: Mark Hounschell Organization: Compro Computer Svcs. Message-ID: <0bb6191c-ee18-627e-f6aa-aa3306e13977@compro.net> Date: Wed, 7 Sep 2016 12:53:51 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.2 MIME-Version: 1.0 In-Reply-To: <20160905164435.446877600@linuxfoundation.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 > > commit 468c298ad3ed3f0d94a65f8ca00f6bfc6c2b4e33 upstream. > > This reverts commit ff06db1efb2ad6db06eb5b99b88a0c15a9cc9b0e. > > Signed-off-by: Greg Kroah-Hartman > > --- > 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