lkml.org 
[lkml]   [2018]   [Jul]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.17 15/67] ata: Fix ZBC_OUT command block check
    Date
    4.17-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Damien Le Moal <damien.lemoal@wdc.com>

    commit b320a0a9f23c98f21631eb27bcbbca91c79b1c6e upstream.

    The block (LBA) specified must not exceed the last addressable LBA,
    which is dev->nr_sectors - 1. So fix the correct check is
    "if (block >= dev->n_sectors)" and not "if (block > dev->n_sectords)".

    Additionally, the asc/ascq to return for an LBA that is not a zone start
    LBA should be ILLEGAL REQUEST, regardless if the bad LBA is out of
    range.

    Reported-by: David Butterfield <david.butterfield@wdc.com>
    Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
    Cc: stable@vger.kernel.org
    Signed-off-by: Tejun Heo <tj@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/ata/libata-scsi.c | 13 +++++++------
    1 file changed, 7 insertions(+), 6 deletions(-)

    --- a/drivers/ata/libata-scsi.c
    +++ b/drivers/ata/libata-scsi.c
    @@ -3802,8 +3802,13 @@ static unsigned int ata_scsi_zbc_out_xla
    */
    goto invalid_param_len;
    }
    - if (block > dev->n_sectors)
    - goto out_of_range;
    + if (block >= dev->n_sectors) {
    + /*
    + * Block must be a valid zone ID (a zone start LBA).
    + */
    + fp = 2;
    + goto invalid_fld;
    + }

    all = cdb[14] & 0x1;

    @@ -3834,10 +3839,6 @@ static unsigned int ata_scsi_zbc_out_xla
    invalid_fld:
    ata_scsi_set_invalid_field(qc->dev, scmd, fp, 0xff);
    return 1;
    - out_of_range:
    - /* "Logical Block Address out of range" */
    - ata_scsi_set_sense(qc->dev, scmd, ILLEGAL_REQUEST, 0x21, 0x00);
    - return 1;
    invalid_param_len:
    /* "Parameter list length error" */
    ata_scsi_set_sense(qc->dev, scmd, ILLEGAL_REQUEST, 0x1a, 0x0);

    \
     
     \ /
      Last update: 2018-07-16 09:58    [W:2.471 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site