From nobody Fri Nov 1 00:10:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589398170; cv=none; d=zohomail.com; s=zohoarc; b=LVnPIogvF5NhhYH76tFdK8aw0ERrF7CnB2Wi30vMtuRiMwme5jNcGiNpJ/Ce9F8EGebJRqncR4mQ4MK6OkCzK9YzGbNNw2omHYONc3exFKgrhLFbwTclibhowxG0ZHIokLP8oKbavqG6K2x/HDxOir0/gir9Gb2XGusDS0uW/2k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589398170; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XIV06agoJGThx8sKxBH0uyMQlIWPA5+B5K3kTkShU5Q=; b=nMOAjWvluvsAgohveQqoJhSlcV1S6i8AliQtktcGRcvAXV1FgCGWN9ByPBac3ong3Ub4voyk5i+ZTPMIsEdD6Q7mcjxiTI7VJ7PHTKWRIncgujJgkibQqBHAfw/Q4t7zh8OGAk2sOzusuKP6/57szzUAYrsSsgfL+MzXLogasxQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589398170053411.29556181876126; Wed, 13 May 2020 12:29:30 -0700 (PDT) Received: from localhost ([::1]:32980 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYx4K-0001Zq-Pe for importer@patchew.org; Wed, 13 May 2020 15:29:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45772) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYx35-0000Fk-Tl for qemu-devel@nongnu.org; Wed, 13 May 2020 15:28:11 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51703 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jYx34-0000fW-Dd for qemu-devel@nongnu.org; Wed, 13 May 2020 15:28:11 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-157-NgRLTLguNPCQpfkKge_rQA-1; Wed, 13 May 2020 15:28:07 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DCDEC460; Wed, 13 May 2020 19:28:05 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.9.109]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 049CE648DB; Wed, 13 May 2020 19:27:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589398088; 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=XIV06agoJGThx8sKxBH0uyMQlIWPA5+B5K3kTkShU5Q=; b=eVkC+t2GxQ1F7FH7KIoJc2yfH1xyUS/TqGLkiWA0ifoHmS9gsYd0tbVpUHjGNKyH60+sQJ 0AyxkVJ909yPgYmIs+jiV6J0fbnOC8c1RBs+PNyncXudHgoiKk8M80OXBpMTM5tBsX8SI/ gAE42Jwa58+3AMAtoLVoGYCJLQEHIi4= X-MC-Unique: NgRLTLguNPCQpfkKge_rQA-1 From: P J P To: QEMU Developers Subject: [PATCH v2 1/3] megasas: use unsigned type for reply_queue_head and check index Date: Thu, 14 May 2020 00:55:38 +0530 Message-Id: <20200513192540.1583887-2-ppandit@redhat.com> In-Reply-To: <20200513192540.1583887-1-ppandit@redhat.com> References: <20200513192540.1583887-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.120; envelope-from=ppandit@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/13 03:05:18 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, 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_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Prasad J Pandit , Alexander Bulekov , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Ding Ren , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Hanqing Zhao Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit A guest user may set 'reply_queue_head' field of MegasasState to a negative value. Later in 'megasas_lookup_frame' it is used to index into s->frames[] array. Use unsigned type to avoid OOB access issue. Also check that 'index' value stays within s->frames[] bounds through the while() loop in 'megasas_lookup_frame' to avoid OOB access. Reported-by: Ren Ding Reported-by: Hanqing Zhao Reported-by: Alexander Bulekov Signed-off-by: Prasad J Pandit Acked-by: Alexander Bulekov --- hw/scsi/megasas.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Update v1 -> v2: fix OOB access when index > MEGASAS_MAX_FRAMES(=3D2048) -> https://lists.gnu.org/archive/html/qemu-devel/2020-05/msg03131.html diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index af18c88b65..6ce598cd69 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -112,7 +112,7 @@ typedef struct MegasasState { uint64_t reply_queue_pa; void *reply_queue; int reply_queue_len; - int reply_queue_head; + uint16_t reply_queue_head; int reply_queue_tail; uint64_t consumer_pa; uint64_t producer_pa; @@ -445,7 +445,7 @@ static MegasasCmd *megasas_lookup_frame(MegasasState *s, =20 index =3D s->reply_queue_head; =20 - while (num < s->fw_cmds) { + while (num < s->fw_cmds && index < MEGASAS_MAX_FRAMES) { if (s->frames[index].pa && s->frames[index].pa =3D=3D frame) { cmd =3D &s->frames[index]; break; --=20 2.25.4 From nobody Fri Nov 1 00:10:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589398176; cv=none; d=zohomail.com; s=zohoarc; b=c786AMk9lXh7InvNCWpqPZwQBjSeuKA0lZOQEJHtOMeoDUjSeFUfhT+yMjqTjctSSXRIbyhIGnWTlm1LrmmuF5yL1DLSQkjMm1L/9Axv251QbuA2GiKaD9kq0FoslGujUwB2Ta0JKKI6LlBi9KgQGSVcssU+1BFDwSqaswncuXM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589398176; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=g7Wwtk9ifLt2PW9urZRkD/faqZdWOc0LKdJZFY+87xA=; b=aN3tqnAjVhMaB9Ju904h6LiCnM+GEJpF9H88k7fFPGkg/IGdGmtqGREbmMPtm6DXpmRQ1oJcNhCyARl3Httt3wNIl4aFOPUPTrRW7RhCXYxPhx+H4ZDePz+AaH2VPOhqyLwL4emhmL/d92pZBpNnLf3myVjTFCepTMHWt1W309s= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 158939817630848.76024584891479; Wed, 13 May 2020 12:29:36 -0700 (PDT) Received: from localhost ([::1]:33592 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYx4Q-0001p0-Vg for importer@patchew.org; Wed, 13 May 2020 15:29:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45778) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYx3G-0000Pz-7Q for qemu-devel@nongnu.org; Wed, 13 May 2020 15:28:27 -0400 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:38579 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jYx3F-0000gL-Bg for qemu-devel@nongnu.org; Wed, 13 May 2020 15:28:21 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-104-yQ0E7Sn-OsivOsMxnUBH8Q-1; Wed, 13 May 2020 15:28:18 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1C4E6102CE3C; Wed, 13 May 2020 19:28:17 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.9.109]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 86B0B6A977; Wed, 13 May 2020 19:28:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589398100; 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=g7Wwtk9ifLt2PW9urZRkD/faqZdWOc0LKdJZFY+87xA=; b=CRtFKZpGZ9MeqZcISkzv91NXDmPbzz2PHB0LqUSboXM9EYIkWSosankGSwp710hgIU8dJb PDUc/ORwdftA4tQ5OwW9rXWgvRU36apz+f+HSpoP+WfXe8oQNUmSff/p+D0zSdXO4K5AYh dUhbMIGDz4loFXFg+TJNiF/iU+RxYho= X-MC-Unique: yQ0E7Sn-OsivOsMxnUBH8Q-1 From: P J P To: QEMU Developers Subject: [PATCH v2 2/3] megasas: avoid NULL pointer dereference Date: Thu, 14 May 2020 00:55:39 +0530 Message-Id: <20200513192540.1583887-3-ppandit@redhat.com> In-Reply-To: <20200513192540.1583887-1-ppandit@redhat.com> References: <20200513192540.1583887-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=205.139.110.61; envelope-from=ppandit@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/13 01:56:38 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, 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_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Prasad J Pandit , Alexander Bulekov , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Ding Ren , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit While in megasas_handle_frame(), megasas_enqueue_frame() may set a NULL frame into MegasasCmd object for a given 'frame_addr' address. Add check to avoid a NULL pointer dereference issue. Reported-by: Alexander Bulekov Fixes: https://bugs.launchpad.net/qemu/+bug/1878259 Signed-off-by: Prasad J Pandit Acked-by: Alexander Bulekov Reviewed-by: Darren Kenny --- hw/scsi/megasas.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index 6ce598cd69..b531d88a9b 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -504,7 +504,7 @@ static MegasasCmd *megasas_enqueue_frame(MegasasState *= s, cmd->pa =3D frame; /* Map all possible frames */ cmd->frame =3D pci_dma_map(pcid, frame, &frame_size_p, 0); - if (frame_size_p !=3D frame_size) { + if (!cmd->frame || frame_size_p !=3D frame_size) { trace_megasas_qf_map_failed(cmd->index, (unsigned long)frame); if (cmd->frame) { megasas_unmap_frame(s, cmd); --=20 2.25.4 From nobody Fri Nov 1 00:10:55 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1589398288; cv=none; d=zohomail.com; s=zohoarc; b=DHc8nRQNwbb1d8szdn6jOY1/0m56ie0DZ1rgs0AA3U2PVpZ4U3nUf0Q1J6Me/5I/l3MInwgztYjpoYSGiJTxeCrYTMeEAoW8kM6+OpGGae/jrg8dhbS3mHMKJUMjkJJ4HSBUWpix6bKpJo/fIK85tQz3u29rCWWIGyJYZb+mzvI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1589398288; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=QCWBQbQl4M0in0x4J/3XDJi50raXKE6Z4/fhXhruLoA=; b=YDlmxl0R78+rPI2L23PdKhRK2dikRILL+KRQDImIPAdStQ4SM3NYldLObSsEdAQ1/DSTgMHjGIufDndn7o6VbWGEaV0ah3gYb+zHv1isrjNbtCYiN0H8hNetyCpqyEQAXjG9+phq+XYus1q4bMPRovYm3pgDhGiAEj8+dW1hT+k= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1589398288530372.27243587396845; Wed, 13 May 2020 12:31:28 -0700 (PDT) Received: from localhost ([::1]:38892 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jYx6F-0004Ag-AH for importer@patchew.org; Wed, 13 May 2020 15:31:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45796) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jYx3O-0000XM-QZ for qemu-devel@nongnu.org; Wed, 13 May 2020 15:28:30 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:36962 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1jYx3N-0000gz-RI for qemu-devel@nongnu.org; Wed, 13 May 2020 15:28:30 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-249-JBgZyYFKNgWwTLHAe9vcDw-1; Wed, 13 May 2020 15:28:27 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E17BA107ACCA; Wed, 13 May 2020 19:28:25 +0000 (UTC) Received: from localhost.localdomain (unknown [10.74.9.109]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B57046A977; Wed, 13 May 2020 19:28:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1589398109; 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=QCWBQbQl4M0in0x4J/3XDJi50raXKE6Z4/fhXhruLoA=; b=Py7+t4JfMck7Kw9jdm9vhuYd9mwAQjA/PgAflYGwB+Ms8CkHoM5T2PdyFzlE+kjftIUD5x LLqpZabNoMnglCqtj9Yh7CUJbDkwcv7vOB+tThOZr8KPPlWwjfPpVPRNykgB75o201Bm8Y jAOWSUmVUefbJF4L0T8wyLWUTL7Dg7A= X-MC-Unique: JBgZyYFKNgWwTLHAe9vcDw-1 From: P J P To: QEMU Developers Subject: [PATCH v2 3/3] megasas: use unsigned type for positive numeric fields Date: Thu, 14 May 2020 00:55:40 +0530 Message-Id: <20200513192540.1583887-4-ppandit@redhat.com> In-Reply-To: <20200513192540.1583887-1-ppandit@redhat.com> References: <20200513192540.1583887-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=207.211.31.81; envelope-from=ppandit@redhat.com; helo=us-smtp-delivery-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/13 04:17:42 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=0.001, 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_H2=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN 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 , Prasad J Pandit , Alexander Bulekov , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Ding Ren , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit Use unsigned type for the MegasasState fields which hold positive numeric values. Signed-off-by: Prasad J Pandit Reviewed-by: Darren Kenny --- hw/scsi/megasas.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/hw/scsi/megasas.c b/hw/scsi/megasas.c index b531d88a9b..634af0bbb8 100644 --- a/hw/scsi/megasas.c +++ b/hw/scsi/megasas.c @@ -86,34 +86,34 @@ typedef struct MegasasState { MemoryRegion queue_io; uint32_t frame_hi; =20 - int fw_state; + uint32_t fw_state; uint32_t fw_sge; uint32_t fw_cmds; uint32_t flags; - int fw_luns; - int intr_mask; - int doorbell; - int busy; - int diag; - int adp_reset; + uint32_t fw_luns; + uint32_t intr_mask; + uint32_t doorbell; + uint32_t busy; + uint32_t diag; + uint32_t adp_reset; OnOffAuto msi; OnOffAuto msix; =20 MegasasCmd *event_cmd; - int event_locale; + uint16_t event_locale; int event_class; - int event_count; - int shutdown_event; - int boot_event; + uint32_t event_count; + uint32_t shutdown_event; + uint32_t boot_event; =20 uint64_t sas_addr; char *hba_serial; =20 uint64_t reply_queue_pa; void *reply_queue; - int reply_queue_len; + uint16_t reply_queue_len; uint16_t reply_queue_head; - int reply_queue_tail; + uint16_t reply_queue_tail; uint64_t consumer_pa; uint64_t producer_pa; =20 @@ -2259,9 +2259,9 @@ static const VMStateDescription vmstate_megasas_gen1 = =3D { VMSTATE_PCI_DEVICE(parent_obj, MegasasState), VMSTATE_MSIX(parent_obj, MegasasState), =20 - VMSTATE_INT32(fw_state, MegasasState), - VMSTATE_INT32(intr_mask, MegasasState), - VMSTATE_INT32(doorbell, MegasasState), + VMSTATE_UINT32(fw_state, MegasasState), + VMSTATE_UINT32(intr_mask, MegasasState), + VMSTATE_UINT32(doorbell, MegasasState), VMSTATE_UINT64(reply_queue_pa, MegasasState), VMSTATE_UINT64(consumer_pa, MegasasState), VMSTATE_UINT64(producer_pa, MegasasState), @@ -2278,9 +2278,9 @@ static const VMStateDescription vmstate_megasas_gen2 = =3D { VMSTATE_PCI_DEVICE(parent_obj, MegasasState), VMSTATE_MSIX(parent_obj, MegasasState), =20 - VMSTATE_INT32(fw_state, MegasasState), - VMSTATE_INT32(intr_mask, MegasasState), - VMSTATE_INT32(doorbell, MegasasState), + VMSTATE_UINT32(fw_state, MegasasState), + VMSTATE_UINT32(intr_mask, MegasasState), + VMSTATE_UINT32(doorbell, MegasasState), VMSTATE_UINT64(reply_queue_pa, MegasasState), VMSTATE_UINT64(consumer_pa, MegasasState), VMSTATE_UINT64(producer_pa, MegasasState), --=20 2.25.4