From nobody Mon Nov 17 23:51:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606849838; cv=none; d=zohomail.com; s=zohoarc; b=E24eu7pi3TFwkuo6y55H1WmWtfSEU5wfHhxTH8TpMElvqSEaoixJCTpJE/S7LfrJ1ojjnwWDn9YtcgeUwiLdw8jWk/AEVuVLWHrE7j4khAOfFp6ln5Ojlqi7NX9BKMqCpM4wYtgHbHwdiWN1NdX5xtY4p2Ij/I2U3qmsxxbFca4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606849838; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=w68SN0Vp+bNQuXrfvEy7wf2Qzh+5W/xWJwTKnBzFmBQ=; b=EPPI5uzJ9wrOljmIQSAoxRDzsugCqTKVKW3RnofWoa5qke6/hNfNrgY1ZHBHiAceg2SRaDBg6MDGVMvuLgqlHsPp1BKsl3NEYPAEYKROF8a2kGjVM8LDZPl91CWkyQxly8U9bxfbLgzkdP4pDZ+hU3SRuTtneqirLTCK20PEkJo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606849838141186.64907793160194; Tue, 1 Dec 2020 11:10:38 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-116-lBZtIucdN8GXmTHOUo9j-w-1; Tue, 01 Dec 2020 14:10:35 -0500 Received: by mail-wm1-f69.google.com with SMTP id r5so1337692wma.2 for ; Tue, 01 Dec 2020 11:10:35 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id h15sm816446wrw.15.2020.12.01.11.10.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 11:10:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606849837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w68SN0Vp+bNQuXrfvEy7wf2Qzh+5W/xWJwTKnBzFmBQ=; b=Gqg5qOL8pHlusLskcS56e+END5rYm2eHesY/OVTkkLX1lhELjECb04uroanAS13UebH7r1 0p30xoRzdrSQ+oL5+/SohwKvIkVuNWpv04AV1oaiXue3ZO6lNRxnGkFK48tDjm6RyYd/hG rMfIb7KCx4FJLeMNtoG/B6BxKLe1ib0= X-MC-Unique: lBZtIucdN8GXmTHOUo9j-w-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=w68SN0Vp+bNQuXrfvEy7wf2Qzh+5W/xWJwTKnBzFmBQ=; b=sIwf2r/2XS4r0rrbAyB//9SIqTHkLjt9QaAEOyjmCubfByC7QQb1Z4UowFnKU2fHuY 78zgWBGJwLlZ0vfbZgxYv+3P9dgZk6YVo4MxCq+S1PXMmFuufyQTQpLCCff6W0Lq8f8Z FDIah/F721FrA1C+5C9AmYtu9XXqGkFQk0CRBOrRBPLq3WMCS8fjrp3fwjOiSqcf0jsW sX1cqV82kZ5icjCk/6kfDKEzQXMOuxGZ/6FooyF1qnoMKWzPtB3OvLQFtKn9WuVHEBa8 BhS+cbJUjDxo6h/0OjAMK+wYvtEb9G8/kGauPjtxgS3EF7WA5j7VM0V96pk+jCEFWfqp eWtA== X-Gm-Message-State: AOAM531keEmrZSm7PQ6/lCVScWMCus9m9ZCTUTQvB4uAOzEbaqkB3BNu CmbqH3k9jvgD1nbnxsI6+zXlO7CXNrsR9qfcPfZg32yH7m/G3N7515IV9olvxvXBYLG2SO8aUj4 4D6AqTFtzkeOllg== X-Received: by 2002:adf:df8e:: with SMTP id z14mr5839907wrl.406.1606849834409; Tue, 01 Dec 2020 11:10:34 -0800 (PST) X-Google-Smtp-Source: ABdhPJw3iMHfFgwziKzD2zjWfuGvRt9Y4QxOFvGVGN8ZlxdU6xeGluloQfXdaWj7jRudSKXaHjLd0w== X-Received: by 2002:adf:df8e:: with SMTP id z14mr5839887wrl.406.1606849834241; Tue, 01 Dec 2020 11:10:34 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Thomas Huth , Hannes Reinecke , Fam Zheng , Li Qiang , Alexander Bulekov , qemu-block@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 1/4] tests/qtest/fuzz-test: Quit test_lp1878642 once done Date: Tue, 1 Dec 2020 20:10:23 +0100 Message-Id: <20201201191026.4149955-2-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201191026.4149955-1-philmd@redhat.com> References: <20201201191026.4149955-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Missed in fd250172842 ("qtest: add a reproducer for LP#1878642"). Reviewed-by: Thomas Huth Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Li Qiang --- tests/qtest/fuzz-test.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/qtest/fuzz-test.c b/tests/qtest/fuzz-test.c index 9cb4c42bdea..87b72307a5b 100644 --- a/tests/qtest/fuzz-test.c +++ b/tests/qtest/fuzz-test.c @@ -45,6 +45,7 @@ static void test_lp1878642_pci_bus_get_irq_level_assert(v= oid) qtest_outl(s, 0xcf8, 0x8400f841); qtest_outl(s, 0xcfc, 0xebed205d); qtest_outl(s, 0x5d02, 0xebed205d); + qtest_quit(s); } =20 int main(int argc, char **argv) --=20 2.26.2 From nobody Mon Nov 17 23:51:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606849846; cv=none; d=zohomail.com; s=zohoarc; b=PlZqB+i76xaP9lDkDGoC0KlSaWfNN1Fd+Uh+/hx4b1lH6EJkBzLJ137X5l8VcqInQE+SgQyKFuw5vtx3QDQZBSRDSg9349OIqpEQ9v9HLLqKjC1WBV/k9btLIsKWwkG3qlHinH/chsVGYtDVfGK2AqtFvhZKz617Faw6K9IVYvM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606849846; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=IjqfFE4wAjPA6W+4g0HRWJuF/SKb/AgR1wTwW244iqE=; b=ZDja45va2CrBe3K0cWbfKiDJF7RQqvBQ4n2xP6R4Kvj4OK69sLfENRLaEqNe4DFXVm3wjX6stw5HMZ8/ZM+wsYp5YranCxSbfw5fARh29FedsQSizuAxZxaS3hlpz/3D8X87eQ2+v1DMyekmOj6jNHNuhA+r9rOxjcx8b5OA0N4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1606849846255616.0358854055922; Tue, 1 Dec 2020 11:10:46 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-59-NM4TmUv3PHWfzr17qiVU2A-1; Tue, 01 Dec 2020 14:10:40 -0500 Received: by mail-wr1-f72.google.com with SMTP id v1so1417196wri.16 for ; Tue, 01 Dec 2020 11:10:40 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id d2sm814662wrn.43.2020.12.01.11.10.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 11:10:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606849845; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IjqfFE4wAjPA6W+4g0HRWJuF/SKb/AgR1wTwW244iqE=; b=TQJZENeEFUM3TywJllH3/np3r1gfOOTaJ0CagLXAHTPOAhZ4gPCTsZ65vmr9OhnHBszbcm K8RWCbkp+BKQR4lYcKlrIsIeeQaIh+F0Dms/QiCHGq1oaSWfupzctwpwwCRDAETPhSMK+I TGLhKIiTwn8P/bZ3izk+0Udjew6bXOk= X-MC-Unique: NM4TmUv3PHWfzr17qiVU2A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IjqfFE4wAjPA6W+4g0HRWJuF/SKb/AgR1wTwW244iqE=; b=cbgb4DokRawT0fkDsUiphyj1nfkOivLDt7/E969aU4j6oZTCJIPF5Rz+0tiNieR8tC OhHTHEsMZTZ4fgPrHYqlwk3p70OLRqcB9t0HXijJ3LdDcRMRZBY7MvADk/g+vmeYYDHa JL/bBJDmDMcsWPriXc5rZF4f9fnM0eCPKcpORmOsFl/55zmLvYQ1JpW36ifc1CUDBPId JIotlE7r3qX/f4k8E905xvIB3pLplzhdCWo1QniVazjjB1ImQvGKwKNbpYStGTxIM3i0 j/8zYKguob8x/qDfPwOFUHTnGcgxR8OTbYCOpzonmFdmKCStpBWyxNGKZKfAgTR4u+wA pFeQ== X-Gm-Message-State: AOAM532s8GmQd+mawM68D1iWDtJNzPN7b7xBdIAzPxMuk9Lz7TH414Gr duCSfeL+y3xQWH73FsjA25JhBNcxevyGVebFPPBlsq+MZ5z480neSTOh063sOMFGhkADTiymUfP wOo7vjgaa9tBzJg== X-Received: by 2002:a7b:cd90:: with SMTP id y16mr4219497wmj.115.1606849839324; Tue, 01 Dec 2020 11:10:39 -0800 (PST) X-Google-Smtp-Source: ABdhPJwYV+xBkY4QniZVOYMWFPWaKiS9tJyJbhljO0KUVTIejeKa9QDyJkFA4gfoElhZ5XaWqqJ4ew== X-Received: by 2002:a7b:cd90:: with SMTP id y16mr4219481wmj.115.1606849839168; Tue, 01 Dec 2020 11:10:39 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Thomas Huth , Hannes Reinecke , Fam Zheng , Li Qiang , Alexander Bulekov , qemu-block@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Daniele Buono Subject: [PATCH v2 2/4] hw/scsi/megasas: Assert cdb_len is valid in megasas_handle_scsi() Date: Tue, 1 Dec 2020 20:10:24 +0100 Message-Id: <20201201191026.4149955-3-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201191026.4149955-1-philmd@redhat.com> References: <20201201191026.4149955-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) cdb_len can not be zero... (or less than 6) here, else we have a out-of-bound read first in scsi_cdb_length(): 71 int scsi_cdb_length(uint8_t *buf) 72 { 73 int cdb_len; 74 75 switch (buf[0] >> 5) { 76 case 0: 77 cdb_len =3D 6; 78 break; Then another out-of-bound read when the size returned by scsi_cdb_length() is used. Figured out after reviewing: https://www.mail-archive.com/qemu-devel@nongnu.org/msg757937.html And reproduced fuzzing: qemu-fuzz-i386: hw/scsi/megasas.c:1679: int megasas_handle_scsi(MegasasSt= ate *, MegasasCmd *, int): Assertion `len > 0 && cdb_len >=3D len' failed. =3D=3D1689590=3D=3D ERROR: libFuzzer: deadly signal #8 0x7f7a5d918e75 in __assert_fail (/lib64/libc.so.6+0x34e75) #9 0x55a1b95cf6d4 in megasas_handle_scsi hw/scsi/megasas.c:1679:5 #10 0x55a1b95cf6d4 in megasas_handle_frame hw/scsi/megasas.c:1975:24 #11 0x55a1b95cf6d4 in megasas_mmio_write hw/scsi/megasas.c:2132:9 #12 0x55a1b981972e in memory_region_write_accessor softmmu/memory.c:4= 91:5 #13 0x55a1b981972e in access_with_adjusted_size softmmu/memory.c:552:= 18 #14 0x55a1b981972e in memory_region_dispatch_write softmmu/memory.c:1= 501:16 #15 0x55a1b97f0ab0 in flatview_write_continue softmmu/physmem.c:2759:= 23 #16 0x55a1b97ec3f2 in flatview_write softmmu/physmem.c:2799:14 #17 0x55a1b97ec3f2 in address_space_write softmmu/physmem.c:2891:18 #18 0x55a1b985c7cd in cpu_outw softmmu/ioport.c:70:5 #19 0x55a1b99577ac in qtest_process_command softmmu/qtest.c:481:13 Inspired-by: Daniele Buono Inspired-by: Alexander Bulekov Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/scsi/megasas.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 1a5fc5857db..f5ad4425b5b 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1667,6 +1667,7 @@ static int megasas_handle_scsi(MegasasState *s, Megas= asCmd *cmd, { uint8_t *cdb; int target_id, lun_id, cdb_len; + int len =3D -1; bool is_write; struct SCSIDevice *sdev =3D NULL; bool is_logical =3D (frame_cmd =3D=3D MFI_CMD_LD_SCSI_IO); @@ -1676,6 +1677,10 @@ static int megasas_handle_scsi(MegasasState *s, Mega= sasCmd *cmd, lun_id =3D cmd->frame->header.lun_id; cdb_len =3D cmd->frame->header.cdb_len; =20 + if (cdb_len > 0) { + len =3D scsi_cdb_length(cdb); + } + assert(len > 0 && cdb_len >=3D len); if (is_logical) { if (target_id >=3D MFI_MAX_LD || lun_id !=3D 0) { trace_megasas_scsi_target_not_present( --=20 2.26.2 From nobody Mon Nov 17 23:51:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606849852; cv=none; d=zohomail.com; s=zohoarc; b=bejYs/XUts6199Q4HQbHlmBN6w4xkICCdFo2cSNcFyDyADnCf+6FawTj0SOSAMHFBc+PzBlh7Mb2Rxo2dkphaLYegsJaTLhaFsFDCy5cn06wd2NjyyV6z2aQXjvTSC/h1MhaZXLQapfNyIcNyQJbRJAIWmWoZ2Ie6XGhHm39t0I= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606849852; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=LXHlJ1LzCveRD1iPVL/bW/urLeua1wvjxYp+o+bw888=; b=lxYr17x1c2cuAF+R4ry7rHKXFvgy5FnLYXfgQxAEr5nYzESePm9Uh0YOceYfYUFINLzSBZkgdPyOINrpZSrzkESF3WFf6LqJChgfgO8xsxIKerg3yRnVkRTiM3opylcWmMPFpEqinm/BXo22oL6Rgtpf0Bi2LWx3NrYabnlmISY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 63.128.21.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mx.zohomail.com with SMTPS id 1606849852048744.7125025662224; Tue, 1 Dec 2020 11:10:52 -0800 (PST) Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-586-nBR19bpwP1u0pLsZCfDaDw-1; Tue, 01 Dec 2020 14:10:48 -0500 Received: by mail-wm1-f69.google.com with SMTP id o17so1294861wmd.9 for ; Tue, 01 Dec 2020 11:10:48 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id p4sm808598wrm.51.2020.12.01.11.10.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 11:10:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606849850; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LXHlJ1LzCveRD1iPVL/bW/urLeua1wvjxYp+o+bw888=; b=hGhRm5+fJR6aflw9emB7T1uZDF1VDmawEf+lCC2hyE6pFp+5dbrd+mzQ8TK3KMFq2asEQ1 wP11TR1EbHWS9aC5hKWCb3sL+/FasFBLytzUAKAqhRSQh/sUkjvbed/1MKROoqq9SgQqfn RpV4gyNj03albg9bQL0z6wAzzOKJ5UQ= X-MC-Unique: nBR19bpwP1u0pLsZCfDaDw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LXHlJ1LzCveRD1iPVL/bW/urLeua1wvjxYp+o+bw888=; b=JNximY9XDp4m0Bijq3qv9vjw9ukBoUvUR8IpSALcizcQjXAy/wTgymSgj/n262Dmh3 h421M9QdurOD2F6vlBji/UPYqOAUackuxG19cJuxb8hVAkdIftIk5UbXfpI9hULJT4kR JE+HiKhVXNosScjIiyKU8CSya0KweCp1ZePH3suGCFxS8x3lO4wWmTDeLQofS4Fd1OVq k00gwazAMJGSo0Ybwlq5LIpbgfZHQSehAOwUfaZ677haMmnHMZdAp+5l+LpUy99Hai/4 WBHRRB3hWZszf51gh0s7kMdfvfnq6Xuam/5LMHV8RxhSWI4f/BObr1sgYU8vrDx1k0+w 8TMA== X-Gm-Message-State: AOAM531wG09vf9QX3zfOp1c6/y62VpGZ4+yfU++k8zCjoAl+EHwjp+3X 0xOCUc0Mu8t/+F2bqQBh6C2AKy8IU5RXLKtdEu6/oLKRbmO+kujHkm2ZcDLLhRwhYH/YMnreuEV sEhgJ42vwslLKbw== X-Received: by 2002:a1c:2c8a:: with SMTP id s132mr4292212wms.119.1606849845893; Tue, 01 Dec 2020 11:10:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJyguvbVskkuL/r+yZY/0Mjhmu35cbiiRs8KSnpxVbQF/m8IAeMZCDY6ayVIxMEw6A3/olCeQw== X-Received: by 2002:a1c:2c8a:: with SMTP id s132mr4292074wms.119.1606849844088; Tue, 01 Dec 2020 11:10:44 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Thomas Huth , Hannes Reinecke , Fam Zheng , Li Qiang , Alexander Bulekov , qemu-block@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH v2 3/4] tests/qtest/fuzz-test: Add test_megasas_cdb_len_zero() reproducer Date: Tue, 1 Dec 2020 20:10:25 +0100 Message-Id: <20201201191026.4149955-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201191026.4149955-1-philmd@redhat.com> References: <20201201191026.4149955-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Add a reproducer which triggers (without the previous patch): $ make check-qtest-x86_64 Running test qtest-x86_64/fuzz-test qemu-system-x86_64: hw/scsi/megasas.c:1679: megasas_handle_scsi: Assertio= n `cdb_len > 0 && scsi_cdb_length(cdb) <=3D cdb_len' failed. tests/qtest/libqtest.c:181: kill_qemu() detected QEMU death from signal 6= (Aborted) (core dumped) ERROR qtest-x86_64/fuzz-test - too few tests run (expected 1, got 0) Signed-off-by: Alexander Bulekov Signed-off-by: Philippe Mathieu-Daud=C3=A9 Acked-by: Thomas Huth --- tests/qtest/fuzz-test.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/qtest/fuzz-test.c b/tests/qtest/fuzz-test.c index 87b72307a5b..31f90cfb4fc 100644 --- a/tests/qtest/fuzz-test.c +++ b/tests/qtest/fuzz-test.c @@ -48,6 +48,23 @@ static void test_lp1878642_pci_bus_get_irq_level_assert(= void) qtest_quit(s); } =20 +static void test_megasas_cdb_len_zero(void) +{ + QTestState *s; + + s =3D qtest_init("-M pc -nodefaults " + "-device megasas-gen2 -device scsi-cd,drive=3Dnull0 " + "-blockdev driver=3Dnull-co,read-zeroes=3Don,node-name= =3Dnull0"); + + qtest_outl(s, 0xcf8, 0x80001011); + qtest_outb(s, 0xcfc, 0xbb); + qtest_outl(s, 0xcf8, 0x80001002); + qtest_outl(s, 0xcfc, 0xf3ff2966); + qtest_writeb(s, 0x4600, 0x03); + qtest_outw(s, 0xbb40, 0x460b); + qtest_quit(s); +} + int main(int argc, char **argv) { const char *arch =3D qtest_get_arch(); @@ -59,6 +76,8 @@ int main(int argc, char **argv) test_lp1878263_megasas_zero_iov_cnt); qtest_add_func("fuzz/test_lp1878642_pci_bus_get_irq_level_assert", test_lp1878642_pci_bus_get_irq_level_assert); + qtest_add_func("fuzz/test_megasas_cdb_len_zero", + test_megasas_cdb_len_zero); } =20 return g_test_run(); --=20 2.26.2 From nobody Mon Nov 17 23:51:10 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1606849856; cv=none; d=zohomail.com; s=zohoarc; b=lxQB1aQ8eGpuxTKEfl18Ram58GseWsHmxVxNh1NzUStTU5ALzZ5hOFTzbkrYIVRb7ZCiNPdYfSSwoNSsoWpD73OxNBbBO1NXCT5RQooJlGz2OSTrkpOghHXr12BqSDzMZ4sX6JWWXc77LmGOI/tuxnZCBauSHB8GsxKVZqTw33k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1606849856; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:To; bh=VGbOkVtccZuNiaIjB/Ue2VFK3Wp2YM6HNCOG5vhEWr0=; b=ceyu+gbZ+4sAzV5xLVyCihheQl2eNndVzP1LFIbmPAcXbiTddSyDJ8vXbYv63P+xHMCowN8sAo5bHwnox7cGmwCpWRt4oFNdRwrXPdiextV5XbWYlRjJBrzKOCd3nQyT1t1TG2N2PGbOgHYemlic6oP7v7BPclDE+tBSGBg/iWQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1606849856757434.54327226826035; Tue, 1 Dec 2020 11:10:56 -0800 (PST) Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-211-6Y7Die2WPuOVe8oPF7iZUg-1; Tue, 01 Dec 2020 14:10:50 -0500 Received: by mail-wr1-f72.google.com with SMTP id x10so1451085wrs.2 for ; Tue, 01 Dec 2020 11:10:50 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id d13sm885463wrb.39.2020.12.01.11.10.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 11:10:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606849854; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VGbOkVtccZuNiaIjB/Ue2VFK3Wp2YM6HNCOG5vhEWr0=; b=SNW/ydiH0zdOhjbEpzQfoQOiXARyryFoNBA6yfB+yjMsudCxJ3KKOM/42MFRoVNfp+jEmA zBIX1yvIjuDnwIlfhFXrkhhN8JDMIzQqln24N4uIhv7ToL1o7w89on3IUpoPepVlAH+EiA v+u68+F2ADsnnyCNgRHxiG5/Q4pXkAg= X-MC-Unique: 6Y7Die2WPuOVe8oPF7iZUg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=VGbOkVtccZuNiaIjB/Ue2VFK3Wp2YM6HNCOG5vhEWr0=; b=Bpjgu1nknWhydiIJtgXPC68yLVACUwA0wgc7OuP6xd15HMwP6tsQoWMVzgiwxbpnHw iW8V4XfOe/+CQ9/ghe8Pa11TnvuhvJzpFjPcgB58DapUeRpPgwRGvrS8/RjmzGhYDayI 5+BwI6vdqNbzIADGy6AmoTMUPHDgLPQp3OHUmn3D+GFofe94UcCDN1MVODCZuQwTaTWE Ofu635+i/XDi8YsciCuJEcSEHmYdFwSEWWMQd3QUJPaHIqCzHOxZ1Tf2bkQIdXhpE4bg Q4Dx5AF86k+f5KL1Jj1kqyJ65STRpoP+pW14l43cenNAc8gprMng7eSqfbDGLVhiUxlb pkeA== X-Gm-Message-State: AOAM530FgSG2bJ+kH5Y5Gyr7NzafgtekLQToPFTPclImoW9/4mbebfKh WzD8G5v0t5MW3RSG0LCCv8nGetqGsPWya9iXyA5IaZs71wN7DkMB/WrNgBK1gHdzrw7ENHEr6dg K+mGZfMZ4l6ECQA== X-Received: by 2002:adf:ec0d:: with SMTP id x13mr5837934wrn.207.1606849849650; Tue, 01 Dec 2020 11:10:49 -0800 (PST) X-Google-Smtp-Source: ABdhPJydC7yDNoLyIxmWwbBbZ6x6HSLyJYzSndkm+uJT6QjVjkW7JltyycHoMoEcWIPvHZPhKK6UVg== X-Received: by 2002:adf:ec0d:: with SMTP id x13mr5837911wrn.207.1606849849526; Tue, 01 Dec 2020 11:10:49 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Thomas Huth , Hannes Reinecke , Fam Zheng , Li Qiang , Alexander Bulekov , qemu-block@nongnu.org, Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [RFC PATCH v2 4/4] hw/scsi/megasas: Have incorrect cdb return MFI_STAT_ABORT_NOT_POSSIBLE Date: Tue, 1 Dec 2020 20:10:26 +0100 Message-Id: <20201201191026.4149955-5-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201191026.4149955-1-philmd@redhat.com> References: <20201201191026.4149955-1-philmd@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Avoid out-of-bound array access with invalid CDB is provided. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- RFC because no clue how hardware works --- hw/scsi/megasas.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index f5ad4425b5b..7e7cbb8854b 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1680,7 +1680,15 @@ static int megasas_handle_scsi(MegasasState *s, Mega= sasCmd *cmd, if (cdb_len > 0) { len =3D scsi_cdb_length(cdb); } - assert(len > 0 && cdb_len >=3D len); + if (len < 0 || len < cdb_len) { + trace_megasas_scsi_invalid_cdb_len(mfi_frame_desc(frame_cmd), + is_logical, target_id, + lun_id, cdb_len); + megasas_write_sense(cmd, SENSE_CODE(INVALID_FIELD)); + cmd->frame->header.scsi_status =3D TASK_ABORTED; + s->event_count++; + return MFI_STAT_ABORT_NOT_POSSIBLE; + } if (is_logical) { if (target_id >=3D MFI_MAX_LD || lun_id !=3D 0) { trace_megasas_scsi_target_not_present( --=20 2.26.2