From patchwork Thu Nov 30 09:22:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Chee Yang" X-Patchwork-Id: 35427 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 41BF4C4167B for ; Thu, 30 Nov 2023 09:42:02 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.68883.1701337314862152094 for ; Thu, 30 Nov 2023 01:41:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=Tr4XGerl; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: chee.yang.lee@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701337314; x=1732873314; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=j1/jXPhb3vo5Da9eFu4TdApLlUOly895T1Dy6Weh5c0=; b=Tr4XGerlCahc+ZitzQydJjXOHWTzHnycwmBRUJLGqhpTfWRkNiFDzcFD wqfpJxGiGkX0hR5OqXI5myMjYYY4xZOtwPUigwRksrm3rS9ItQQ3hNYmP uExnlssPit3HviqoKiYSP1RjXpeFmw1b28SywFvZbpiIv5Wnu9YLAwjSx TVfYNz8oSBxwzky9fYfXqkm/tvWu/Br0dFaMWAxxtGvxSGVvJLhyar2Fr qJKH/sNNshqcmB2EaWSMxJX15HwDeeEdwEV4XeppET3U6Bc5YXMEyP/dl wOVr6/wMtkp2Ony8erwdJJLHU/zd+GPLIjNvpP3+8IHMeDdXGfWqhud5F A==; X-IronPort-AV: E=McAfee;i="6600,9927,10909"; a="378327531" X-IronPort-AV: E=Sophos;i="6.04,237,1695711600"; d="scan'208";a="378327531" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2023 01:41:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10909"; a="887184624" X-IronPort-AV: E=Sophos;i="6.04,237,1695711600"; d="scan'208";a="887184624" Received: from andromeda02.png.intel.com ([10.221.253.198]) by fmsmga002.fm.intel.com with ESMTP; 30 Nov 2023 01:41:53 -0800 From: chee.yang.lee@intel.com To: openembedded-core@lists.openembedded.org Subject: [nanbield][PATCH 1/3] python3-urllib3: Upgrade to 2.0.7 Date: Thu, 30 Nov 2023 17:22:13 +0800 Message-Id: <20231130092215.2435495-1-chee.yang.lee@intel.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 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 ; Thu, 30 Nov 2023 09:42:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191486 From: Khem Raj Addresses CVE-2023-45803 [1] [1] https://github.com/urllib3/urllib3/commit/4e98d57809dacab1cbe625fddeec1a290c478ea9 ( cherry-pick from commit befec4d3591bb0dce0e256cf338eb541b2a56b98 ) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie Signed-off-by: Lee Chee Yang --- .../{python3-urllib3_2.0.6.bb => python3-urllib3_2.0.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-urllib3_2.0.6.bb => python3-urllib3_2.0.7.bb} (87%) diff --git a/meta/recipes-devtools/python/python3-urllib3_2.0.6.bb b/meta/recipes-devtools/python/python3-urllib3_2.0.7.bb similarity index 87% rename from meta/recipes-devtools/python/python3-urllib3_2.0.6.bb rename to meta/recipes-devtools/python/python3-urllib3_2.0.7.bb index cd2a9dd4ef..c286838086 100644 --- a/meta/recipes-devtools/python/python3-urllib3_2.0.6.bb +++ b/meta/recipes-devtools/python/python3-urllib3_2.0.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=52d273a3054ced561275d4d15260ecda" -SRC_URI[sha256sum] = "b19e1a85d206b56d7df1d5e683df4a7725252a964e3993648dd0fb5a1c157564" +SRC_URI[sha256sum] = "c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84" inherit pypi python_hatchling From patchwork Thu Nov 30 09:22:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Lee, Chee Yang" X-Patchwork-Id: 35428 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 4331CC46CA0 for ; Thu, 30 Nov 2023 09:42:02 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.68883.1701337314862152094 for ; Thu, 30 Nov 2023 01:41:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=EhRbE6y3; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: chee.yang.lee@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701337315; x=1732873315; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=9h3iPHGADrUx7IXBz3hCu/B7lxLa1wp0bQUxaQPbNLE=; b=EhRbE6y3nrNcn7gzenRYVfeyq2GpiAXD7x4Lhqmn7ui1o63sLS+Gwy3E bOak+eLtI6jYgn9puvr/QddcdVfksNTK44CWDQCOAqTvu1qpT5xNMd2Bn Cs3fByrGizLD+k7UokVFFhhGGiUAD6dREqAm2M8WrSEVNFmboOrG//Xiv eS5EPTMihM+NoSehfr99JpnzXaU71j80dCc7MvQRnJUMg7frnuYFQz0ej 0FMMGykL+664OrX4B9HP8Mv6zE8+MkUqQM93Ge2nudyUaY3WqrJ6CmJIt CKt48J7MGpfDR84uiM8gTl5+560LXta97uQBGInELq9fBHjxHcOz3GgfQ A==; X-IronPort-AV: E=McAfee;i="6600,9927,10909"; a="378327536" X-IronPort-AV: E=Sophos;i="6.04,237,1695711600"; d="scan'208";a="378327536" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2023 01:41:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10909"; a="887184625" X-IronPort-AV: E=Sophos;i="6.04,237,1695711600"; d="scan'208";a="887184625" Received: from andromeda02.png.intel.com ([10.221.253.198]) by fmsmga002.fm.intel.com with ESMTP; 30 Nov 2023 01:41:54 -0800 From: chee.yang.lee@intel.com To: openembedded-core@lists.openembedded.org Subject: [nanbield][PATCH 2/3] qemu: Upgrade 8.1.0 -> 8.1.2 Date: Thu, 30 Nov 2023 17:22:14 +0800 Message-Id: <20231130092215.2435495-2-chee.yang.lee@intel.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20231130092215.2435495-1-chee.yang.lee@intel.com> References: <20231130092215.2435495-1-chee.yang.lee@intel.com> MIME-Version: 1.0 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 ; Thu, 30 Nov 2023 09:42:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191487 From: Richard Purdie Drop three backport patches as they're applied upstream. ( cherry-pick from commit 7480ff9064a74858e83e0ae275dbdb78dd6fc2a4 ) Signed-off-by: Richard Purdie Signed-off-by: Lee Chee Yang --- ...u-native_8.1.0.bb => qemu-native_8.1.2.bb} | 0 ...e_8.1.0.bb => qemu-system-native_8.1.2.bb} | 0 meta/recipes-devtools/qemu/qemu.inc | 5 +- ...t-data-in-bounds-in-iotlb_to_section.patch | 42 ----- ...u-Use-async_run_on_cpu-in-tcg_commit.patch | 157 ------------------ .../qemu/qemu/CVE-2023-42467.patch | 49 ------ .../qemu/{qemu_8.1.0.bb => qemu_8.1.2.bb} | 0 7 files changed, 1 insertion(+), 252 deletions(-) rename meta/recipes-devtools/qemu/{qemu-native_8.1.0.bb => qemu-native_8.1.2.bb} (100%) rename meta/recipes-devtools/qemu/{qemu-system-native_8.1.0.bb => qemu-system-native_8.1.2.bb} (100%) delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-softmmu-Assert-data-in-bounds-in-iotlb_to_section.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/0001-softmmu-Use-async_run_on_cpu-in-tcg_commit.patch delete mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch rename meta/recipes-devtools/qemu/{qemu_8.1.0.bb => qemu_8.1.2.bb} (100%) diff --git a/meta/recipes-devtools/qemu/qemu-native_8.1.0.bb b/meta/recipes-devtools/qemu/qemu-native_8.1.2.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-native_8.1.0.bb rename to meta/recipes-devtools/qemu/qemu-native_8.1.2.bb diff --git a/meta/recipes-devtools/qemu/qemu-system-native_8.1.0.bb b/meta/recipes-devtools/qemu/qemu-system-native_8.1.2.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu-system-native_8.1.0.bb rename to meta/recipes-devtools/qemu/qemu-system-native_8.1.2.bb diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 78c495516f..5ab2cb83b4 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -29,18 +29,15 @@ 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 \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" -SRC_URI[sha256sum] = "710c101198e334d4762eef65f649bc43fa8a5dd75303554b8acfec3eb25f0e55" +SRC_URI[sha256sum] = "541526a764576eb494d2ff5ec46aeb253e62ea29035d1c23c0a8af4e6cd4f087" 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/0001-softmmu-Use-async_run_on_cpu-in-tcg_commit.patch b/meta/recipes-devtools/qemu/qemu/0001-softmmu-Use-async_run_on_cpu-in-tcg_commit.patch deleted file mode 100644 index 8289b45991..0000000000 --- a/meta/recipes-devtools/qemu/qemu/0001-softmmu-Use-async_run_on_cpu-in-tcg_commit.patch +++ /dev/null @@ -1,157 +0,0 @@ -From 0d58c660689f6da1e3feff8a997014003d928b3b Mon Sep 17 00:00:00 2001 -From: Richard Henderson -Date: Fri, 25 Aug 2023 16:13:17 -0700 -Subject: [PATCH] softmmu: Use async_run_on_cpu in tcg_commit -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -After system startup, run the update to memory_dispatch -and the tlb_flush on the cpu. This eliminates a race, -wherein a running cpu sees the memory_dispatch change -but has not yet seen the tlb_flush. - -Since the update now happens on the cpu, we need not use -qatomic_rcu_read to protect the read of memory_dispatch. - -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1826 -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1834 -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1846 -Tested-by: Alex Bennée -Reviewed-by: Alex Bennée -Signed-off-by: Richard Henderson - -Upstream-Status: Backport [0d58c660689f6da1e3feff8a997014003d928b3b] ---- - accel/tcg/cpu-exec-common.c | 30 ---------------------------- - include/exec/cpu-common.h | 1 - - softmmu/physmem.c | 40 +++++++++++++++++++++++++++---------- - 3 files changed, 29 insertions(+), 42 deletions(-) - -Index: qemu-8.1.0/accel/tcg/cpu-exec-common.c -=================================================================== ---- qemu-8.1.0.orig/accel/tcg/cpu-exec-common.c -+++ qemu-8.1.0/accel/tcg/cpu-exec-common.c -@@ -33,36 +33,6 @@ void cpu_loop_exit_noexc(CPUState *cpu) - cpu_loop_exit(cpu); - } - --#if defined(CONFIG_SOFTMMU) --void cpu_reloading_memory_map(void) --{ -- if (qemu_in_vcpu_thread() && current_cpu->running) { -- /* The guest can in theory prolong the RCU critical section as long -- * as it feels like. The major problem with this is that because it -- * can do multiple reconfigurations of the memory map within the -- * critical section, we could potentially accumulate an unbounded -- * collection of memory data structures awaiting reclamation. -- * -- * Because the only thing we're currently protecting with RCU is the -- * memory data structures, it's sufficient to break the critical section -- * in this callback, which we know will get called every time the -- * memory map is rearranged. -- * -- * (If we add anything else in the system that uses RCU to protect -- * its data structures, we will need to implement some other mechanism -- * to force TCG CPUs to exit the critical section, at which point this -- * part of this callback might become unnecessary.) -- * -- * This pair matches cpu_exec's rcu_read_lock()/rcu_read_unlock(), which -- * only protects cpu->as->dispatch. Since we know our caller is about -- * to reload it, it's safe to split the critical section. -- */ -- rcu_read_unlock(); -- rcu_read_lock(); -- } --} --#endif -- - void cpu_loop_exit(CPUState *cpu) - { - /* Undo the setting in cpu_tb_exec. */ -Index: qemu-8.1.0/include/exec/cpu-common.h -=================================================================== ---- qemu-8.1.0.orig/include/exec/cpu-common.h -+++ qemu-8.1.0/include/exec/cpu-common.h -@@ -133,7 +133,6 @@ static inline void cpu_physical_memory_w - { - cpu_physical_memory_rw(addr, (void *)buf, len, true); - } --void cpu_reloading_memory_map(void); - void *cpu_physical_memory_map(hwaddr addr, - hwaddr *plen, - bool is_write); -Index: qemu-8.1.0/softmmu/physmem.c -=================================================================== ---- qemu-8.1.0.orig/softmmu/physmem.c -+++ qemu-8.1.0/softmmu/physmem.c -@@ -680,8 +680,7 @@ address_space_translate_for_iotlb(CPUSta - IOMMUTLBEntry iotlb; - int iommu_idx; - hwaddr addr = orig_addr; -- AddressSpaceDispatch *d = -- qatomic_rcu_read(&cpu->cpu_ases[asidx].memory_dispatch); -+ AddressSpaceDispatch *d = cpu->cpu_ases[asidx].memory_dispatch; - - for (;;) { - section = address_space_translate_internal(d, addr, &addr, plen, false); -@@ -2412,7 +2411,7 @@ MemoryRegionSection *iotlb_to_section(CP - { - int asidx = cpu_asidx_from_attrs(cpu, attrs); - CPUAddressSpace *cpuas = &cpu->cpu_ases[asidx]; -- AddressSpaceDispatch *d = qatomic_rcu_read(&cpuas->memory_dispatch); -+ AddressSpaceDispatch *d = cpuas->memory_dispatch; - int section_index = index & ~TARGET_PAGE_MASK; - MemoryRegionSection *ret; - -@@ -2487,23 +2486,42 @@ static void tcg_log_global_after_sync(Me - } - } - -+static void tcg_commit_cpu(CPUState *cpu, run_on_cpu_data data) -+{ -+ CPUAddressSpace *cpuas = data.host_ptr; -+ -+ cpuas->memory_dispatch = address_space_to_dispatch(cpuas->as); -+ tlb_flush(cpu); -+} -+ - static void tcg_commit(MemoryListener *listener) - { - CPUAddressSpace *cpuas; -- AddressSpaceDispatch *d; -+ CPUState *cpu; - - assert(tcg_enabled()); - /* since each CPU stores ram addresses in its TLB cache, we must - reset the modified entries */ - cpuas = container_of(listener, CPUAddressSpace, tcg_as_listener); -- cpu_reloading_memory_map(); -- /* The CPU and TLB are protected by the iothread lock. -- * We reload the dispatch pointer now because cpu_reloading_memory_map() -- * may have split the RCU critical section. -+ cpu = cpuas->cpu; -+ -+ /* -+ * Defer changes to as->memory_dispatch until the cpu is quiescent. -+ * Otherwise we race between (1) other cpu threads and (2) ongoing -+ * i/o for the current cpu thread, with data cached by mmu_lookup(). -+ * -+ * In addition, queueing the work function will kick the cpu back to -+ * the main loop, which will end the RCU critical section and reclaim -+ * the memory data structures. -+ * -+ * That said, the listener is also called during realize, before -+ * all of the tcg machinery for run-on is initialized: thus halt_cond. - */ -- d = address_space_to_dispatch(cpuas->as); -- qatomic_rcu_set(&cpuas->memory_dispatch, d); -- tlb_flush(cpuas->cpu); -+ if (cpu->halt_cond) { -+ async_run_on_cpu(cpu, tcg_commit_cpu, RUN_ON_CPU_HOST_PTR(cpuas)); -+ } else { -+ tcg_commit_cpu(cpu, RUN_ON_CPU_HOST_PTR(cpuas)); -+ } - } - - static void memory_map_init(void) diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch b/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch deleted file mode 100644 index 86ab7cf81a..0000000000 --- a/meta/recipes-devtools/qemu/qemu/CVE-2023-42467.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 7cfcc79b0ab800959716738aff9419f53fc68c9c Mon Sep 17 00:00:00 2001 -From: Thomas Huth -Date: Thu, 5 Oct 2023 06:01:10 +0000 -Subject: [PATCH] hw/scsi/scsi-disk: Disallow block sizes smaller than 512 - [CVE-2023-42467] - -We are doing things like - - nb_sectors /= (s->qdev.blocksize / BDRV_SECTOR_SIZE); - -in the code here (e.g. in scsi_disk_emulate_mode_sense()), so if -the blocksize is smaller than BDRV_SECTOR_SIZE (=512), this crashes -with a division by 0 exception. Thus disallow block sizes of 256 -bytes to avoid this situation. - -Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1813 -CVE: 2023-42467 -Signed-off-by: Thomas Huth -Message-ID: <20230925091854.49198-1-thuth@redhat.com> -Signed-off-by: Paolo Bonzini - -CVE: CVE-2023-42467 - -Upstream-Status: Backport [https://gitlab.com/qemu-project/qemu/-/commit/7cfcc79b0ab800959716738aff9419f53fc68c9c] - -Signed-off-by: Yogita Urade ---- - hw/scsi/scsi-disk.c | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c -index e0d79c796..477ee2bcd 100644 ---- a/hw/scsi/scsi-disk.c -+++ b/hw/scsi/scsi-disk.c -@@ -1628,9 +1628,10 @@ static void scsi_disk_emulate_mode_select(SCSIDiskReq *r, uint8_t *inbuf) - * Since the existing code only checks/updates bits 8-15 of the block - * size, restrict ourselves to the same requirement for now to ensure - * that a block size set by a block descriptor and then read back by -- * a subsequent SCSI command will be the same -+ * a subsequent SCSI command will be the same. Also disallow a block -+ * size of 256 since we cannot handle anything below BDRV_SECTOR_SIZE. - */ -- if (bs && !(bs & ~0xff00) && bs != s->qdev.blocksize) { -+ if (bs && !(bs & ~0xfe00) && bs != s->qdev.blocksize) { - s->qdev.blocksize = bs; - trace_scsi_disk_mode_select_set_blocksize(s->qdev.blocksize); - } --- -2.40.0 diff --git a/meta/recipes-devtools/qemu/qemu_8.1.0.bb b/meta/recipes-devtools/qemu/qemu_8.1.2.bb similarity index 100% rename from meta/recipes-devtools/qemu/qemu_8.1.0.bb rename to meta/recipes-devtools/qemu/qemu_8.1.2.bb From patchwork Thu Nov 30 09:22:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lee, Chee Yang" X-Patchwork-Id: 35429 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 65BE9C10DC1 for ; Thu, 30 Nov 2023 09:42:02 +0000 (UTC) Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by mx.groups.io with SMTP id smtpd.web10.68883.1701337314862152094 for ; Thu, 30 Nov 2023 01:41:56 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@intel.com header.s=Intel header.b=Fz71WJ+a; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: chee.yang.lee@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701337316; x=1732873316; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=zSRpm9vkus/npU/q99mvNIPokqsYZub9lzwYfGcb68M=; b=Fz71WJ+apWoe/mm5oHZJXd5GyMeMr1jqOZ2uQ0865+JVkOf2O/vbtQuG Ba5fj3vwRRP2ESauGtOqzXIusFgiuC997P5Canv77pjgkHJy9ifaHFL6N 08Pb5WBiOK0qFS4bc/6mViG1kD9Ns42mTKOHo87CTp9uxfzIPwF0U7+BM EIkC6hk0RQ8KwWqTsDw/rwHoSVecCPoFv58QEku6LY3LXF00j07j77MID NbfKLcBiRphYWsnH5DrkHoj/5RnAQkOoRySVH0KmjYT6DVi+MCMVSQxD0 BJrijQBIIaoIYe2nII2eveFjE43OKILDWioaigs8n3MiVnAJd7aLYn8WY Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10909"; a="378327540" X-IronPort-AV: E=Sophos;i="6.04,237,1695711600"; d="scan'208";a="378327540" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 30 Nov 2023 01:41:55 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10909"; a="887184627" X-IronPort-AV: E=Sophos;i="6.04,237,1695711600"; d="scan'208";a="887184627" Received: from andromeda02.png.intel.com ([10.221.253.198]) by fmsmga002.fm.intel.com with ESMTP; 30 Nov 2023 01:41:55 -0800 From: chee.yang.lee@intel.com To: openembedded-core@lists.openembedded.org Subject: [nanbield][PATCH 3/3] xwayland: upgrade to 23.2.2 Date: Thu, 30 Nov 2023 17:22:15 +0800 Message-Id: <20231130092215.2435495-3-chee.yang.lee@intel.com> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20231130092215.2435495-1-chee.yang.lee@intel.com> References: <20231130092215.2435495-1-chee.yang.lee@intel.com> MIME-Version: 1.0 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 ; Thu, 30 Nov 2023 09:42:02 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/191488 From: Ross Burton e4487cae1 Bump version to 23.2.2 1e8478455 Xi/randr: fix handling of PropModeAppend/Prepend (CVE-2023-5367) 829a99117 Switch to libbsd-overlay 4f8a851b6 xwayland: Cancel the EI disconnect timer when freed cc79b2a83 glamor: xv: Fix invalid accessing of plane attributes for NV12 07c18c90e xwayland: Give up on EI on setup failure 10353a01a xwayland: Add an option to enable EI portal support 4f8e209d2 xwayland/glamor/gbm: Set GBM_BO_USE_LINEAR if only LINEAR modifier is supported c9a842e60 xwayland/present: Handle NULL window_priv in xwl_present_cleanup 2bd43be92 glamor: fixes GL_INVALID_ENUM errors on ES if there is no quads ( cherry-pick from commit 7d0fc94d09db76d4c4d6ca9d2da1b30768f68c9e ) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie Signed-off-by: Lee Chee Yang --- .../xwayland/{xwayland_23.2.1.bb => xwayland_23.2.2.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xwayland/{xwayland_23.2.1.bb => xwayland_23.2.2.bb} (95%) diff --git a/meta/recipes-graphics/xwayland/xwayland_23.2.1.bb b/meta/recipes-graphics/xwayland/xwayland_23.2.2.bb similarity index 95% rename from meta/recipes-graphics/xwayland/xwayland_23.2.1.bb rename to meta/recipes-graphics/xwayland/xwayland_23.2.2.bb index e97a921a96..9feac147db 100644 --- a/meta/recipes-graphics/xwayland/xwayland_23.2.1.bb +++ b/meta/recipes-graphics/xwayland/xwayland_23.2.2.bb @@ -10,7 +10,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" -SRC_URI[sha256sum] = "eebc2692c3aa80617d78428bc6ec7b91b254a98214d2a70e997098503cd6ef90" +SRC_URI[sha256sum] = "9f7c0938d2a41e941ffa04f99c35e5db2bcd3eec034afe8d35d5c810a22eb0a8" UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar"