From patchwork Tue Dec 1 15:13:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 11943143 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07C28C64E90 for ; Tue, 1 Dec 2020 15:17:59 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5BB012076C for ; Tue, 1 Dec 2020 15:17:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="gMcU8uOz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5BB012076C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:48614 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kk7Ph-0002ck-6m for qemu-devel@archiver.kernel.org; Tue, 01 Dec 2020 10:17:57 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:59458) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kk7Le-0006tE-Kz for qemu-devel@nongnu.org; Tue, 01 Dec 2020 10:13:47 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:56912) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kk7LZ-0001Nm-Vb for qemu-devel@nongnu.org; Tue, 01 Dec 2020 10:13:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1606835620; 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=qBFNmsAY0ghtrhw1W9KOeLTbVaGUVxqihitXlC5SVfI=; b=gMcU8uOzSiCRxy9kt9h2e90QdWCaKF4tVMTdTYMvXIjwDSolc7avJhE7/6fe3VuQuZxVmf xEOTlD+vYSnIFuFLQXj697etf6XcOWlJkUO+Iv2Rmnq7HhN0WOaSI+ET7JGT0t105UtoBX xAVjSRdUJFPdmauft3WCdwZNCSB9KPs= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-394-OcUZyBAyO7uHTSjEk4IK9A-1; Tue, 01 Dec 2020 10:13:39 -0500 X-MC-Unique: OcUZyBAyO7uHTSjEk4IK9A-1 Received: by mail-wm1-f72.google.com with SMTP id a134so788141wmd.8 for ; Tue, 01 Dec 2020 07:13:38 -0800 (PST) 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=qBFNmsAY0ghtrhw1W9KOeLTbVaGUVxqihitXlC5SVfI=; b=PBV3DJD0BownkfaVBOdFdRr8cpqutwHrwgJTM0PTbit0PooSrV7kJiBKxt+L1LHOW7 8rM2mmdAYN7vtAjMa0mKpCQdvA4wc30TGQ8msMTANNksXOUH4fY6WrUJn5dWrjnDLxN4 HAiDdtkF6VlFyXCEs2YgS7aAtnbTIb1sl/EOEd/d0h/npjdQPrZ7bkXYRJEgWyN+9QMS HM2BRMqsY1jqyhTGkbCt0kXCt1RPMBUBWdjmhRriakedR2ClNf97BXC3e5zgNvQO7aQQ MC3cqzqxx5g4UQGzDmaEbnbBTtz173hSI/Tl59nySrpX8xEoEESEcnw2DBdoxuy/SEiu jsRw== X-Gm-Message-State: AOAM5305Fa1yuFBZCtCctzx0ElyeuOz4iLHwWYlOTqfnM/t42XJ6/qjI HKl+LsxOq+i2XrJW59mjfrkr3ki2crWk8h0r1BjdHTm1JnE3Z41lNFUnpPcySx+XTzqmUAOgnbK DdweJPeAjya7JB6ReIdhDXh5B61XibEm+2ZwHTgenV137mGLXtnEjGPBKSUb9nGjm X-Received: by 2002:adf:f9c6:: with SMTP id w6mr4396203wrr.273.1606835617639; Tue, 01 Dec 2020 07:13:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJyKq/XH9OOJePvtqpdJ8px5vdnIYIbhbgIAwy2/r8PK6lDcC6RpABDguStMYtAiJzbzUbDV3A== X-Received: by 2002:adf:f9c6:: with SMTP id w6mr4396170wrr.273.1606835617441; Tue, 01 Dec 2020 07:13:37 -0800 (PST) Received: from localhost.localdomain (111.red-88-21-205.staticip.rima-tde.net. [88.21.205.111]) by smtp.gmail.com with ESMTPSA id w3sm279594wma.3.2020.12.01.07.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 01 Dec 2020 07:13:36 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [RFC PATCH 3/3] hw/scsi/megasas: Have incorrect cdb return MFI_STAT_ABORT_NOT_POSSIBLE Date: Tue, 1 Dec 2020 16:13:19 +0100 Message-Id: <20201201151319.2943325-4-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201201151319.2943325-1-philmd@redhat.com> References: <20201201151319.2943325-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 Received-SPF: pass client-ip=63.128.21.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -35 X-Spam_score: -3.6 X-Spam_bar: --- X-Spam_report: (-3.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.497, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 , Laurent Vivier , Thomas Huth , qemu-block@nongnu.org, Li Qiang , Hannes Reinecke , Alexander Bulekov , Paolo Bonzini , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Avoid out-of-bound array access with invalid CDB is provided. Signed-off-by: Philippe Mathieu-Daudé --- RFC because I have no clue how hardware works. Maybe returning MFI_STAT_ARRAY_INDEX_INVALID is better? Do we need to call megasas_write_sense()? hw/scsi/megasas.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 28efd094111..d89a3c8c3ce 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -1676,7 +1676,12 @@ static int megasas_handle_scsi(MegasasState *s, MegasasCmd *cmd, lun_id = cmd->frame->header.lun_id; cdb_len = cmd->frame->header.cdb_len; - assert(cdb_len > 0 && scsi_cdb_length(cdb) >= cdb_len); + if (!cdb_len || scsi_cdb_length(cdb) < cdb_len) { + trace_megasas_scsi_invalid_cdb_len(mfi_frame_desc(frame_cmd), + is_logical, target_id, + lun_id, cdb_len); + return MFI_STAT_ABORT_NOT_POSSIBLE; + } if (is_logical) { if (target_id >= MFI_MAX_LD || lun_id != 0) { trace_megasas_scsi_target_not_present(