Received: from eggs.gnu.org ([209.51.188.92]:45747) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hLSfw-0004z9-Pm for qemu-devel@nongnu.org; Tue, 30 Apr 2019 09:20:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hLSfw-00054x-1M for qemu-devel@nongnu.org; Tue, 30 Apr 2019 09:20:00 -0400 Received: from inet-orm.provo.novell.com ([137.65.248.124]:49033 helo=mail.novell.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hLSfv-00053e-OO for qemu-devel@nongnu.org; Tue, 30 Apr 2019 09:19:59 -0400 From: Bruce Rogers Date: Tue, 30 Apr 2019 07:19:46 -0600 Message-Id: <20190430131946.26628-1-brogers@suse.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PATCH v2] scsi-disk: handle invalid cdb length List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, fam@euphon.net, Bruce Rogers While investigating link-time-optimization, the compiler flagged this case of not handling the error return from scsi_cdb_length(). Handle this error case with a trace report. Signed-off-by: Bruce Rogers --- hw/scsi/scsi-disk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index e7e865ab3b..8fbf7512e5 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2520,6 +2520,10 @@ static void scsi_disk_new_request_dump(uint32_t lun, uint32_t tag, uint8_t *buf) int len = scsi_cdb_length(buf); char *line_buffer, *p; + if (len < 0) { + trace_scsi_disk_new_request(lun, tag, "bad cdb length"); + return; + } line_buffer = g_malloc(len * 5 + 1); for (i = 0, p = line_buffer; i < len; i++) { -- 2.21.0