From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a19:5205:0:0:0:0:0 with SMTP id m5csp1174072lfb; Fri, 3 Sep 2021 04:07:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzx1kx2mPFqo71XObBScrlEcpdEffPKFI+Y8fSwqq2+4RjjS2CW9FPOmoZ6V+YCtwRqrq5 X-Received: by 2002:a17:906:4c89:: with SMTP id q9mr3616826eju.118.1630667276497; Fri, 03 Sep 2021 04:07:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1630667276; cv=none; d=google.com; s=arc-20160816; b=zyK3AbEVjh1sw+RvpXCGVPm6F19VhpTBiYucnqCu3qR+AimOAsXvzkpdzhTOKPLcT7 X0JhmURY5YVE0c5VXQmbhHocSnNsEuVr0bN5xoL3WepIp8nwsRQ/BZ/gkRX1OXMYbEgI RgMbRualBNuiJT58334SMSEdENxEvuh4VMBcFrR8+6MaYiof0FaCoge5gj8uy0KBiUhh g8CrxDXLP0xebZyJhGMvk88/WXinoGAtflkGrn084xsHmSoTSnxsfKtYEPzY6aCRQi+u 4tHVMr96a6TP4zFq4ruYmP1wGidify36a154o2lJjqHBH48G6y0RqCR7uX3cdMnox8vy p70g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=6osDXRphDo8TIq2I2JrJLj4Iq8ymwMld3GU8FS2XmwE=; b=S4OdIXR2DXD/PS+FN4ee+KTjjqp+RY+u16RnzVZS4gpGxAjmoJ8yZ5NV0RJm+FMvCu Qu3waZNxgHlEa1QngZ6MmLyvq5mye0X4gPy8JSnXji2nxA69vwhKoVJNBrHq4tLMc36O Z96WJ4x3sb+eYYTygNlU//gc5eadDNSI5ANBUrBWcTPe98tsnwQQOV48U1d/7iDe/tOu h91nCQEpDLaeN35TpVvLsyW87ZcQSEkx1/gXWAMZbaiqC/xfSQSr+7R+eCFqQEaMrG5V jMU9WKZeVky8CxXmNzzhiTwz1rwuQKaxPNwe2mpoRspgt6iIin+NL7jE4X9pR9SSd7Lx bz6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="K/RsAjjm"; spf=pass (google.com: domain of philmd@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com. [170.10.133.124]) by mx.google.com with ESMTPS id h15si5150568ede.550.2021.09.03.04.07.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 03 Sep 2021 04:07:56 -0700 (PDT) Received-SPF: pass (google.com: domain of philmd@redhat.com designates 170.10.133.124 as permitted sender) client-ip=170.10.133.124; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="K/RsAjjm"; spf=pass (google.com: domain of philmd@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630667275; 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=6osDXRphDo8TIq2I2JrJLj4Iq8ymwMld3GU8FS2XmwE=; b=K/RsAjjmcwmdhv/Pljpc4h1QiW26qVIPBPaNE/pw0ByKbLGpCTQ2QNeglA9Pob+TmYtSSY 6XKRcXQ/XSbxJv6qWuWyWUcRbM3p0VBDvRB0w79+KmvDgB+vo8g0yoYE7P9n8zUeErjmhN tvhTwyFmPenlQDC/tIHmnOCcFhcxnxI= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-154-zj74yHxEM_GXx85p0K2--g-1; Fri, 03 Sep 2021 07:07:52 -0400 X-MC-Unique: zj74yHxEM_GXx85p0K2--g-1 Received: by mail-wm1-f70.google.com with SMTP id v2-20020a7bcb420000b02902e6b108fcf1so2511736wmj.8 for ; Fri, 03 Sep 2021 04:07:52 -0700 (PDT) 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=6osDXRphDo8TIq2I2JrJLj4Iq8ymwMld3GU8FS2XmwE=; b=lArvgDVVvtqJWuJJl/g9lMljheTeQ50fXgcMlBhKOuylNshLG7+ES7gy7UH5PZGltZ 3LBV8lLJ2Twbyj4ONQvF+2keLt8C7Bsbw8YJrcKRAied8CziZ0zfjC9S5fL0syoAEsii b5N3+GPI5l8kXla3xUvp07WZbI4Bhs8EGlu16OeEXX+Wr1h74JlHY9bohtZzoijpVA6t mgVQHqRS12dA5c2wED+l1kLJAqs/NeIdv1elh8SbxRGMxEhh0rjXyY0nNrsqQugPGhcd zzlkgrw7g1fFpgqvXQqF17+muYuEX/IPTsLtJ8dWWC38aUGgfuogc6B79sPzqEQH0eHx f8vA== X-Gm-Message-State: AOAM531DVJXo+JhnTi1DnxOqWqFKSR759LaIK+MO+6LaNz8c8lILSQ4Y MvqM62YhD+7B3q+DtH55PyxVCrbiXN79avn7oCeWWKqSPx6tEr20fv5Kw0oQaCbyoTC5bSPXS35 gcNOA7tEXpQBmldyH X-Received: by 2002:a5d:526a:: with SMTP id l10mr3307829wrc.279.1630667271416; Fri, 03 Sep 2021 04:07:51 -0700 (PDT) X-Received: by 2002:a5d:526a:: with SMTP id l10mr3307771wrc.279.1630667271215; Fri, 03 Sep 2021 04:07:51 -0700 (PDT) Return-Path: Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id b12sm5141598wrx.72.2021.09.03.04.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 04:07:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Hanna Reitz , Igor Mammedov , Laurent Vivier , Alexandre Iooss , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Michael Roth , Zhang Chen , Shannon Zhao , Richard Henderson , Alex Williamson , Eduardo Habkost , Markus Armbruster , Eric Blake , Stefan Weil , John Snow , Mahmoud Mandour , Li Zhijian , Marcel Apfelbaum , qemu-block@nongnu.org, Helge Deller , "Michael S. Tsirkin" , David Gibson , Peter Xu , "Gonglei (Arei)" , Gerd Hoffmann , Fam Zheng , Jason Wang , Vladimir Sementsov-Ogievskiy , Christian Schoenebeck , Kevin Wolf , Yuval Shaia , Paolo Bonzini , Peter Maydell , qemu-arm@nongnu.org, Thomas Huth , Laurent Vivier , Greg Kurz , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-ppc@nongnu.org, David Hildenbrand Subject: [PATCH 08/28] hw/acpi: Avoid truncating acpi_data_len() to 32-bit Date: Fri, 3 Sep 2021 13:06:42 +0200 Message-Id: <20210903110702.588291-9-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210903110702.588291-1-philmd@redhat.com> References: <20210903110702.588291-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: 8bit X-TUID: +mJLWsl6KPpn acpi_data_len() returns an unsigned type, which might be bigger than 32-bit (although it is unlikely such value is returned). Hold the returned value in an 'unsigned' type to avoid unlikely size truncation. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/virt-acpi-build.c | 2 +- hw/i386/acpi-build.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 037cc1fd82c..95543d43e2a 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -885,7 +885,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) static void acpi_ram_update(MemoryRegion *mr, GArray *data) { - uint32_t size = acpi_data_len(data); + unsigned size = acpi_data_len(data); /* Make sure RAM size is correct - in case it got changed * e.g. by migration */ diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index a33ac8b91e1..aa269914b49 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2660,7 +2660,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) static void acpi_ram_update(MemoryRegion *mr, GArray *data) { - uint32_t size = acpi_data_len(data); + unsigned size = acpi_data_len(data); /* Make sure RAM size is correct - in case it got changed e.g. by migration */ memory_region_ram_resize(mr, size, &error_abort); @@ -2783,7 +2783,7 @@ void acpi_setup(void) * Though RSDP is small, its contents isn't immutable, so * we'll update it along with the rest of tables on guest access. */ - uint32_t rsdp_size = acpi_data_len(tables.rsdp); + unsigned rsdp_size = acpi_data_len(tables.rsdp); build_state->rsdp = g_memdup(tables.rsdp->data, rsdp_size); fw_cfg_add_file_callback(x86ms->fw_cfg, ACPI_BUILD_RSDP_FILE, -- 2.31.1 From mboxrd@z Thu Jan 1 00:00:00 1970 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 38C6CC433EF for ; Fri, 3 Sep 2021 11:22:40 +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 AD0AB6108E for ; Fri, 3 Sep 2021 11:22:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AD0AB6108E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:32830 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mM7HJ-0006Ab-MK for qemu-devel@archiver.kernel.org; Fri, 03 Sep 2021 07:22:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM738-0005g3-IQ for qemu-devel@nongnu.org; Fri, 03 Sep 2021 07:08:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:55380) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mM735-0000fY-1S for qemu-devel@nongnu.org; Fri, 03 Sep 2021 07:07:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630667274; 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=6osDXRphDo8TIq2I2JrJLj4Iq8ymwMld3GU8FS2XmwE=; b=W1DnljpiBY9qB3ZSegVKjfn+TYRTSSmvIbawbN4BUSFVPnpyYugJKvlHj0YiACPgWD+pGL QBY1ulWppzy1i0WHshtBMhwFSrGyemfvBsd3g+51F/Fa6c14EtW1eY3l0jKOT3g75R1nxS F6k58msnOQMd+45MqvgueyHRWDaZ5RY= Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-326-bGciXd1RPPmJmnkqyXvzng-1; Fri, 03 Sep 2021 07:07:53 -0400 X-MC-Unique: bGciXd1RPPmJmnkqyXvzng-1 Received: by mail-wr1-f71.google.com with SMTP id i16-20020adfded0000000b001572ebd528eso1443187wrn.19 for ; Fri, 03 Sep 2021 04:07:52 -0700 (PDT) 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=6osDXRphDo8TIq2I2JrJLj4Iq8ymwMld3GU8FS2XmwE=; b=o5sbmwKgPtkzDF/AhfWcYUwGTpGrXUDpxc68ZOYHxkCj2nLT32/6M9p5Emm2L0TKG3 znTv2VfhL8RpQplz0G3QLj/vCGM8ZhxJSbC8w5v9J1DzOw1x9+woSqUT26GWZnnosF14 4zJdZFlWWc3o9ausSXlDiXL6OS6bLv1C4xl05licSDQf5c0BVjvi/4vVgxfmlDpp1BvQ bdl2DgQtgme9xRctZZkjmdOM8OzJHijo6POuNETYFOD2WqHlPR0dIqwiQwqZKLqV0Cvy XTVyNtjCzHE86X99rcyOUx0m9yjqZfEELtw3JQqF8sdqejVyqgrcVUu6ox1HsVHdTe/T L1Ow== X-Gm-Message-State: AOAM5339XlvaIeHCxkCBCsPP7aqXMEkhNaXz/C04G/qTn7vWy1o07Y9H 1r+jKDf/wWUa7EfingwOw22PsHaJrsWBVwtA6K5EPM2qDoN04gYkKVmgsL9yo66OsIQBEaPLVmv WX71bSwy+PI0jsnuoxnatYLU7nHMJ5XT9mf8dvpYt/ijY3Ddd+b/hPLQtQW5hgntY X-Received: by 2002:a5d:526a:: with SMTP id l10mr3307842wrc.279.1630667271474; Fri, 03 Sep 2021 04:07:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxcJFg+fUtt74cezEjGtPfJjbB/p8oBH6n6a0g8f/lUmZ5V9PLYMGF1/ZME4j9YjZI6HscUjA== X-Received: by 2002:a5d:526a:: with SMTP id l10mr3307771wrc.279.1630667271215; Fri, 03 Sep 2021 04:07:51 -0700 (PDT) Received: from x1w.. (163.red-83-52-55.dynamicip.rima-tde.net. [83.52.55.163]) by smtp.gmail.com with ESMTPSA id b12sm5141598wrx.72.2021.09.03.04.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Sep 2021 04:07:50 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Subject: [PATCH 08/28] hw/acpi: Avoid truncating acpi_data_len() to 32-bit Date: Fri, 3 Sep 2021 13:06:42 +0200 Message-Id: <20210903110702.588291-9-philmd@redhat.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210903110702.588291-1-philmd@redhat.com> References: <20210903110702.588291-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: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) DKIMWL_WL_HIGH=-0.392, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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 , Peter Maydell , Li Zhijian , "Michael S. Tsirkin" , Jason Wang , Christian Schoenebeck , Yuval Shaia , Peter Xu , Gerd Hoffmann , Alexandre Iooss , Eric Blake , qemu-block@nongnu.org, Zhang Chen , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Helge Deller , David Hildenbrand , Markus Armbruster , "Gonglei \(Arei\)" , Stefan Weil , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Laurent Vivier , Thomas Huth , Eduardo Habkost , Michael Roth , Richard Henderson , Greg Kurz , Alex Williamson , qemu-arm@nongnu.org, Paolo Bonzini , John Snow , David Gibson , Kevin Wolf , Vladimir Sementsov-Ogievskiy , Laurent Vivier , Shannon Zhao , Hanna Reitz , qemu-ppc@nongnu.org, Igor Mammedov , Mahmoud Mandour Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" acpi_data_len() returns an unsigned type, which might be bigger than 32-bit (although it is unlikely such value is returned). Hold the returned value in an 'unsigned' type to avoid unlikely size truncation. Signed-off-by: Philippe Mathieu-Daudé --- hw/arm/virt-acpi-build.c | 2 +- hw/i386/acpi-build.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c index 037cc1fd82c..95543d43e2a 100644 --- a/hw/arm/virt-acpi-build.c +++ b/hw/arm/virt-acpi-build.c @@ -885,7 +885,7 @@ void virt_acpi_build(VirtMachineState *vms, AcpiBuildTables *tables) static void acpi_ram_update(MemoryRegion *mr, GArray *data) { - uint32_t size = acpi_data_len(data); + unsigned size = acpi_data_len(data); /* Make sure RAM size is correct - in case it got changed * e.g. by migration */ diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index a33ac8b91e1..aa269914b49 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -2660,7 +2660,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine) static void acpi_ram_update(MemoryRegion *mr, GArray *data) { - uint32_t size = acpi_data_len(data); + unsigned size = acpi_data_len(data); /* Make sure RAM size is correct - in case it got changed e.g. by migration */ memory_region_ram_resize(mr, size, &error_abort); @@ -2783,7 +2783,7 @@ void acpi_setup(void) * Though RSDP is small, its contents isn't immutable, so * we'll update it along with the rest of tables on guest access. */ - uint32_t rsdp_size = acpi_data_len(tables.rsdp); + unsigned rsdp_size = acpi_data_len(tables.rsdp); build_state->rsdp = g_memdup(tables.rsdp->data, rsdp_size); fw_cfg_add_file_callback(x86ms->fw_cfg, ACPI_BUILD_RSDP_FILE, -- 2.31.1