From nobody Mon Apr 29 19:09:02 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 ARC-Seal: i=1; a=rsa-sha256; t=1592826329; cv=none; d=zohomail.com; s=zohoarc; b=MXDaybzkKsLm60mqyTVjMKt++pJRc2L/bObnjJ5hDFFbuiZskSOHIKRwxDVKHl3GpDhPj5/TSL3XHUULRvFpqbyoPneM+6XGjSpH5i8PWGeVbJF1WQc8VNr7980oA9CrftghMVT3FT+85eXBDcspzvAbKZ1G7jKq9d+FpX6Z4lQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592826329; h=Content-Type:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=HWV2ILM3xMCOup6xeC3fFZCVzCQ1GFg5+jCYD4iG/P8=; b=Gp90DPxclSb1RzoJUYxmTS0S/g4XNjpq7z/fo/aS4AaLOD9zQGpMnQJ15K69vZBOh8A2QSMQSPssS+ZMNLiznGH1HkCWikDT0cC7G2ZYe8mxk3dyc586ZDUbkGl8D531/VuUGpdFU/Kn5XKFsdwUQHbOiROf6ExVIMutA3U8Jmo= ARC-Authentication-Results: i=1; mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592826329075738.0799886157507; Mon, 22 Jun 2020 04:45:29 -0700 (PDT) Received: from localhost ([::1]:39304 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jnKtC-0000C5-Aw for importer@patchew.org; Mon, 22 Jun 2020 07:45:26 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47446) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnKeq-0004rF-06; Mon, 22 Jun 2020 07:30:36 -0400 Received: from szxga04-in.huawei.com ([45.249.212.190]:3713 helo=huawei.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jnKen-0000F4-2X; Mon, 22 Jun 2020 07:30:35 -0400 Received: from DGGEMS414-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id 3CEAEEF0DB6EF6E7C302; Mon, 22 Jun 2020 19:30:23 +0800 (CST) Received: from huawei.com (10.151.151.243) by DGGEMS414-HUB.china.huawei.com (10.3.19.214) with Microsoft SMTP Server id 14.3.487.0; Mon, 22 Jun 2020 19:30:14 +0800 From: Dongjiu Geng To: , , Subject: [PATCH] ACPI: Assert that we don't run out of the preallocated memory Date: Mon, 22 Jun 2020 19:31:46 +0800 Message-ID: <20200622113146.33421-1-gengdongjiu@huawei.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-Originating-IP: [10.151.151.243] X-CFilter-Loop: Reflected 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=45.249.212.190; envelope-from=gengdongjiu@huawei.com; helo=huawei.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/22 07:30:24 X-ACL-Warn: Detected OS = Linux 3.11 and newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H4=-0.01, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_PASS=-0.001, SPF_PASS=-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: zhengxiang9@huawei.com, qemu-arm@nongnu.org, qemu-devel@nongnu.org, linuxarm@huawei.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" data_length is a constant value, so we use assert instead of condition check. Signed-off-by: Dongjiu Geng Reviewed-by: Michael S. Tsirkin --- 1. Address Peter and Michael's comments to use assert instead of if(). https://lore.kernel.org/qemu-devel/ca79ea28-9ea9-18a5-99ad-25c3eb744721@hua= wei.com/ --- hw/acpi/ghes.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/hw/acpi/ghes.c b/hw/acpi/ghes.c index b363bc331d..f0ee9f51ca 100644 --- a/hw/acpi/ghes.c +++ b/hw/acpi/ghes.c @@ -204,16 +204,12 @@ static int acpi_ghes_record_mem_error(uint64_t error_= block_address, =20 /* This is the length if adding a new generic error data entry*/ data_length =3D ACPI_GHES_DATA_LENGTH + ACPI_GHES_MEM_CPER_LENGTH; - /* - * Check whether it will run out of the preallocated memory if adding = a new - * generic error data entry + * It should not run out of the preallocated memory if adding a new ge= neric + * error data entry */ - if ((data_length + ACPI_GHES_GESB_SIZE) > ACPI_GHES_MAX_RAW_DATA_LENGT= H) { - error_report("Not enough memory to record new CPER!!!"); - g_array_free(block, true); - return -1; - } + assert((data_length + ACPI_GHES_GESB_SIZE) <=3D + ACPI_GHES_MAX_RAW_DATA_LENGTH); =20 /* Build the new generic error status block header */ acpi_ghes_generic_error_status(block, ACPI_GEBS_UNCORRECTABLE, --=20 2.17.1