From patchwork Sun Oct 15 19:45:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: auh@yoctoproject.org X-Patchwork-Id: 32309 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0281AC04AAE for ; Sun, 15 Oct 2023 19:45:23 +0000 (UTC) Received: from a27-23.smtp-out.us-west-2.amazonses.com (a27-23.smtp-out.us-west-2.amazonses.com [54.240.27.23]) by mx.groups.io with SMTP id smtpd.web10.102671.1697399114527812666 for ; Sun, 15 Oct 2023 12:45:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@yoctoproject.org header.s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky header.b=Pmh5BUyl; dkim=pass header.i=@amazonses.com header.s=hsbnp7p3ensaochzwyq5wwmceodymuwv header.b=RXsVkUuV; spf=pass (domain: automation.yoctoproject.org, ip: 54.240.27.23, mailfrom: 0101018b34df0ad8-18a09ed7-2267-4ebe-a4e4-8a27c1928e61-000000@automation.yoctoproject.org) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=lvjh2tk576v2ro5mi6k4dt3mc6wpqbky; d=yoctoproject.org; t=1697399114; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date; bh=oSFs/mCUrwXhauRlExz4tkGF+QTfEZLiuvT0uVEju8g=; b=Pmh5BUyljYeIhVdjiNZq1JZoaGDXV7xn68xFPKnwPrqGOxO2HW2i4C5HNJ2bcLqm jG3iUKY/10C8KxhdbiOkShXYC9HVGxtxqwyQZGhZ7im9OixvEzfTY4OzwVZq6sgwmwZ FX4eSroSBmShrlqWeeiFLWx7/2psGtPplAsKruUo= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/simple; s=hsbnp7p3ensaochzwyq5wwmceodymuwv; d=amazonses.com; t=1697399114; h=Content-Type:MIME-Version:From:To:Cc:Subject:Message-Id:Date:Feedback-ID; bh=oSFs/mCUrwXhauRlExz4tkGF+QTfEZLiuvT0uVEju8g=; b=RXsVkUuVdsfaR3KNBBuBdzRv/DBDFat3P7Gs7z5bef6xrvAKbBq+T0vBxpkpWtL0 Uew9YmPNOplB1TG1EFECmnfMZ5wY9GcC/v6KN6XHXCwHiCVRq0Cdlh6SuFzu6qS0yX1 FntXmW5fJWJpSm9jzAw3GLu8itjHDnIFkHvfULHo= MIME-Version: 1.0 From: auh@yoctoproject.org To: Richard Purdie Cc: openembedded-core@lists.openembedded.org Subject: [AUH] qemu: upgrading to 8.1.1 FAILED Message-ID: <0101018b34df0ad8-18a09ed7-2267-4ebe-a4e4-8a27c1928e61-000000@us-west-2.amazonses.com> Date: Sun, 15 Oct 2023 19:45:14 +0000 Feedback-ID: 1.us-west-2.9np3MYPs3fEaOBysGKSlUD4KtcmPijcmS9Az2Hwf7iQ=:AmazonSES X-SES-Outgoing: 2023.10.15-54.240.27.23 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Sun, 15 Oct 2023 19:45:22 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189198 Hello, this email is a notification from the Auto Upgrade Helper that the automatic attempt to upgrade the recipe *qemu* to *8.1.1* has Failed(do_compile). Detailed error information: do_compile failed Next steps: - apply the patch: git am 0001-qemu-upgrade-8.1.0-8.1.1.patch - check the changes to upstream patches and summarize them in the commit message, - compile an image that contains the package - perform some basic sanity tests - amend the patch and sign it off: git commit -s --reset-author --amend - send it to the appropriate mailing list Alternatively, if you believe the recipe should not be upgraded at this time, you can fill RECIPE_NO_UPDATE_REASON in respective recipe file so that automatic upgrades would no longer be attempted. Please review the attached files for further information and build/update failures. Any problem please file a bug at https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Automated%20Update%20Handler Regards, The Upgrade Helper -- >8 -- From d076ee28d4d7c5ed63a06f53bc2274fb877f44e3 Mon Sep 17 00:00:00 2001 From: Upgrade Helper Date: Sun, 15 Oct 2023 12:53:17 +0000 Subject: [PATCH] qemu: upgrade 8.1.0 -> 8.1.1 --- meta/recipes-devtools/qemu/qemu.inc | 6 +-- ...t-data-in-bounds-in-iotlb_to_section.patch | 42 ------------------- .../qemu/{qemu_8.1.0.bb => qemu_8.1.1.bb} | 0 3 files changed, 3 insertions(+), 45 deletions(-) delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-softmmu-Assert-data-in-bounds-in-iotlb_to_section.patch rename meta/recipes-devtools/qemu/{qemu_8.1.0.bb => qemu_8.1.1.bb} (100%) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index b331f87c0d..21cdc2530a 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,18 +29,18 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://0009-Define-MAP_SYNC-and-MAP_SHARED_VALIDATE-on-needed-li.patch \ file://0010-hw-pvrdma-Protect-against-buggy-or-malicious-guest-d.patch \ file://0002-linux-user-Replace-use-of-lfs64-related-functions-an.patch \ - file://0001-softmmu-Assert-data-in-bounds-in-iotlb_to_section.patch \ file://0001-softmmu-Use-async_run_on_cpu-in-tcg_commit.patch \ file://fixedmeson.patch \ file://fixmips.patch \ file://qemu-guest-agent.init \ file://qemu-guest-agent.udev \ - file://CVE-2023-42467.patch \ + file://CVE-2023-42467.patch \ + file://cross.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "710c101198e334d4762eef65f649bc43fa8a5dd75303554b8acfec3eb25f0e55" +SRC_URI[sha256sum] = "37ce2ef5e500fb752f681117c68b45118303ea49a7e26bd54080ced54fab7def" SRC_URI:append:class-target = " file://cross.patch" SRC_URI:append:class-nativesdk = " file://cross.patch" diff --git a/meta/recipes-devtools/qemu/qemu/0001-softmmu-Assert-data-in-bounds-in-iotlb_to_section.patch b/meta/recipes-devtools/qemu/qemu/0001-softmmu-Assert-data-in-bounds-in-iotlb_to_section.patch deleted file mode 100644 index 7380e16ab3..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0001-softmmu-Assert-data-in-bounds-in-iotlb_to_section.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 86e4f93d827d3c1efd00cd8a906e38a2c0f2b5bc Mon Sep 17 00:00:00 2001 -From: Richard Henderson -Date: Fri, 25 Aug 2023 14:06:58 -0700 -Subject: [PATCH] softmmu: Assert data in bounds in iotlb_to_section -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Acked-by: Alex Bennée -Suggested-by: Alex Bennée -Signed-off-by: Richard Henderson - -Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/86e4f93d827d3c1efd00cd8a906e38a2c0f2b5bc] ---- - softmmu/physmem.c | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/softmmu/physmem.c b/softmmu/physmem.c -index 3df73542e1..7597dc1c39 100644 ---- a/softmmu/physmem.c -+++ b/softmmu/physmem.c -@@ -2413,9 +2413,15 @@ MemoryRegionSection *iotlb_to_section(CPUState *cpu, - int asidx = cpu_asidx_from_attrs(cpu, attrs); - CPUAddressSpace *cpuas = &cpu->cpu_ases[asidx]; - AddressSpaceDispatch *d = qatomic_rcu_read(&cpuas->memory_dispatch); -- MemoryRegionSection *sections = d->map.sections; -+ int section_index = index & ~TARGET_PAGE_MASK; -+ MemoryRegionSection *ret; -+ -+ assert(section_index < d->map.sections_nb); -+ ret = d->map.sections + section_index; -+ assert(ret->mr); -+ assert(ret->mr->ops); - -- return §ions[index & ~TARGET_PAGE_MASK]; -+ return ret; - } - - static void io_mem_init(void) --- -2.34.1 - diff --git a/meta/recipes-devtools/qemu/qemu_8.1.0.bb b/meta/recipes-devtools/qemu/qemu_8.1.1.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_8.1.0.bb rename to meta/recipes-devtools/qemu/qemu_8.1.1.bb