Commit 2770c90d authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

scsi: fix scsi_convert_sense crash when in_buf == NULL && in_len == 0 



scsi_disk_emulate_command passes in_buf == NULL when sent a REQUEST
SENSE command.  Check for in_len == 0 before dereferencing in_buf.

Fixes: f68d98b2
Reported-by: default avatarRoman Kagan <rkagan@virtuozzo.com>
Tested-by: default avatarRoman Kagan <rkagan@virtuozzo.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d9bcd6f7

scsi/utils.c

+6 −6
Original line number Diff line number Diff line
@@ -322,19 +322,19 @@ int scsi_convert_sense(uint8_t *in_buf, int in_len, 
    SCSISense sense;

    bool fixed_in;



    if (in_len == 0) {

        return scsi_build_sense_buf(buf, len, SENSE_CODE(NO_SENSE), fixed);

    }



    fixed_in = (in_buf[0] & 2) == 0;

    if (in_len && fixed == fixed_in) {

    if (fixed == fixed_in) {

        memcpy(buf, in_buf, MIN(len, in_len));

        return MIN(len, in_len);

    }



    if (in_len == 0) {

        sense = SENSE_CODE(NO_SENSE);

    } else {

        sense = scsi_parse_sense_buf(in_buf, in_len);

    }

        return scsi_build_sense_buf(buf, len, sense, fixed);

    }

}



int scsi_sense_to_errno(int key, int asc, int ascq)

{