From patchwork Fri Aug 9 06:38:34 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 11085413 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 866E8746 for ; Fri, 9 Aug 2019 06:41:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7359928C2A for ; Fri, 9 Aug 2019 06:41:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 673DB28C2D; Fri, 9 Aug 2019 06:41:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B56DA28C2A for ; Fri, 9 Aug 2019 06:41:36 +0000 (UTC) Received: from localhost ([::1]:56656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvyam-0005C4-7s for patchwork-qemu-devel@patchwork.kernel.org; Fri, 09 Aug 2019 02:41:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46809) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvya3-0004Gu-VC for qemu-devel@nongnu.org; Fri, 09 Aug 2019 02:40:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvya2-0006kf-Iv for qemu-devel@nongnu.org; Fri, 09 Aug 2019 02:40:51 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43060) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvya2-0006jy-De for qemu-devel@nongnu.org; Fri, 09 Aug 2019 02:40:50 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id B6916300BEAC; Fri, 9 Aug 2019 06:40:49 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.10.36]) by smtp.corp.redhat.com (Postfix) with ESMTPS id D045019C70; Fri, 9 Aug 2019 06:40:45 +0000 (UTC) From: P J P To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Date: Fri, 9 Aug 2019 12:08:34 +0530 Message-Id: <20190809063835.6717-2-ppandit@redhat.com> In-Reply-To: <20190809063835.6717-1-ppandit@redhat.com> References: <20190809063835.6717-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Fri, 09 Aug 2019 06:40:49 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 1/2] scsi: lsi: exit infinite loop while executing script (CVE-2019-12068) X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Prasad J Pandit , Marcelo Tosatti , Mark Cave-Ayland , QEMU Developers , Bugs SysSec , Paolo Bonzini , Stefano Garzarella Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Prasad J Pandit When executing script in lsi_execute_script(), the LSI scsi adapter emulator advances 's->dsp' index to read next opcode. This can lead to an infinite loop if the next opcode is empty. Exit such loop after reading 10k empty opcodes. Reported-by: Bugs SysSec Signed-off-by: Prasad J Pandit --- hw/scsi/lsi53c895a.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) Update v3: raise an illegal instruction interrupt and exit -> https://lists.gnu.org/archive/html/qemu-devel/2019-08/msg01427.html diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index 10468c1ec1..e703ef4c9d 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -185,6 +185,9 @@ static const char *names[] = { /* Flag set if this is a tagged command. */ #define LSI_TAG_VALID (1 << 16) +/* Maximum instructions to process. */ +#define LSI_MAX_INSN 10000 + typedef struct lsi_request { SCSIRequest *req; uint32_t tag; @@ -1132,7 +1135,13 @@ static void lsi_execute_script(LSIState *s) s->istat1 |= LSI_ISTAT1_SRUN; again: - insn_processed++; + if (++insn_processed > LSI_MAX_INSN) { + trace_lsi_execute_script_tc_illegal(); + lsi_script_dma_interrupt(s, LSI_DSTAT_IID); + lsi_disconnect(s); + trace_lsi_execute_script_stop(); + return; + } insn = read_dword(s, s->dsp); if (!insn) { /* If we receive an empty opcode increment the DSP by 4 bytes From patchwork Fri Aug 9 06:38:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Prasad Pandit X-Patchwork-Id: 11085415 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2010C13B1 for ; Fri, 9 Aug 2019 06:42:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0BC1128C2A for ; Fri, 9 Aug 2019 06:42:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F2D0428C2D; Fri, 9 Aug 2019 06:42:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8642E28C2A for ; Fri, 9 Aug 2019 06:42:35 +0000 (UTC) Received: from localhost ([::1]:56664 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvybi-0006Pf-VX for patchwork-qemu-devel@patchwork.kernel.org; Fri, 09 Aug 2019 02:42:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:46859) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hvya9-0004Sn-SK for qemu-devel@nongnu.org; Fri, 09 Aug 2019 02:40:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hvya8-0006qJ-SC for qemu-devel@nongnu.org; Fri, 09 Aug 2019 02:40:57 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45656) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hvya8-0006ph-N5 for qemu-devel@nongnu.org; Fri, 09 Aug 2019 02:40:56 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 06B4830BE7DB; Fri, 9 Aug 2019 06:40:56 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.10.36]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5329019C70; Fri, 9 Aug 2019 06:40:50 +0000 (UTC) From: P J P To: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Date: Fri, 9 Aug 2019 12:08:35 +0530 Message-Id: <20190809063835.6717-3-ppandit@redhat.com> In-Reply-To: <20190809063835.6717-1-ppandit@redhat.com> References: <20190809063835.6717-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Fri, 09 Aug 2019 06:40:56 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v3 2/2] scsi: lsi: use macro LSI_MAX_INSN instead of a magic number X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fam Zheng , Prasad J Pandit , Marcelo Tosatti , Mark Cave-Ayland , QEMU Developers , Bugs SysSec , Paolo Bonzini , Stefano Garzarella Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Prasad J Pandit Use macro 'LSI_MAX_INSN' instead of a magic number 10000. Signed-off-by: Prasad J Pandit --- hw/scsi/lsi53c895a.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c index e703ef4c9d..f6786607f8 100644 --- a/hw/scsi/lsi53c895a.c +++ b/hw/scsi/lsi53c895a.c @@ -1578,7 +1578,7 @@ again: } } } - if (insn_processed > 10000 && s->waiting == LSI_NOWAIT) { + if (insn_processed > LSI_MAX_INSN && s->waiting == LSI_NOWAIT) { /* Some windows drivers make the device spin waiting for a memory location to change. If we have been executed a lot of code then assume this is the case and force an unexpected device disconnect.