From patchwork Fri Aug 19 02:42:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11571 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 AB49AC28B2B for ; Fri, 19 Aug 2022 02:43:15 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web12.50623.1660876989441373707 for ; Thu, 18 Aug 2022 19:43:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=6AhScS51; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id jm11so3016175plb.13 for ; Thu, 18 Aug 2022 19:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=qiM5FlFvRxeAkPOrBRpvJUQ8Fr5dIz6Flf5kTvrE1lw=; b=6AhScS51U1+6ayQBJJc0CmONXkoFW3BnbBX8zaFCrX8xtomKhAunnTEdZKIJmIt2Z3 2is8Z3KXtXTt6tpp5F4OgChKVPDtsfvcwW1BuU6LRFaktBnoWsKJkfDeq42BXkMdZosb ZCSmyrbIgf+U6BvH23+aTtva9rySBC4PiXLSJOicGMPM4tPwJT24r5jcJXbx1EYyvOtd 9d0uqpaUCx6WJN+d5CP2YkzTlvytUMEii+lLxyIbZT9NemmINPP++PXoLHkAo+E89OvR swH+oCI29PSIiYbAhWxWq/BUBeQvVtBx4RCuMXqwB4AeyqTVemOnfQ+BolEyUaYMcX2o SFYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=qiM5FlFvRxeAkPOrBRpvJUQ8Fr5dIz6Flf5kTvrE1lw=; b=uajv5uv3cSRe7fvtjZCXv1qIo+YaOpym+Upyb6XwkQZLMYiuzgdSbcXe15QDyl52m9 cNH8tNmnkSkcTsRCm0pY9QfgL5dswo2V3/9APFt/eagSffAJyT6YjoTUa4tD/HSKl93t EN7TJG4LoViMIjyIwi1n+qEMT1/u4JmiLSrLYo3wS94je3SPPnXDuqAlfOHxaGwc8NdI mqbSERU2wO1jqBfTjtDNv0Z1eMqOQxR7pKoRAvZ0bZWgWCtnaTnaRj/33vlxpJR9Zg/9 qzj3PO9w4CnlNKXcN5uN8FnxQlOz6NdOLVxUjO2kD7OJrAswEPWB9bQS8ga7Y94RrSdf Qeyg== X-Gm-Message-State: ACgBeo2VbAD40YjM/Yygj6Ntrq2LYjUoUygWEn/LJZ9NuX8cIS2jNETg qoU6pfuIAEkJ7fTAi46ExgMPofALa2RZy71v X-Google-Smtp-Source: AA6agR4C/vW08DYzl6o6Hf4wtwoIU1wERN5rSR9Bsh8rSzLqbxUShcY7FE2qWs5WaimOC9YHagInvA== X-Received: by 2002:a17:90a:9a8a:b0:1fa:b4c1:c94 with SMTP id e10-20020a17090a9a8a00b001fab4c10c94mr10954856pjp.210.1660876988448; Thu, 18 Aug 2022 19:43:08 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/26] gdk-pixbuf: CVE-2021-46829 a heap-based buffer overflow Date: Thu, 18 Aug 2022 16:42:23 -1000 Message-Id: <978bc910ac326e34ec4f99c4645a80ed09c65407.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:15 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169544 From: Hitendra Prajapati Source: https://gitlab.gnome.org/GNOME/gdk-pixbuf MR: 120379 Type: Security Fix Disposition: Backport from https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/5398f04d772f7f8baf5265715696ed88db0f0512 ChangeID: 37f962b51bdb0c522b2a991c549fd29e3d2e58d7 Description: CVE-2021-46829 gdk-pixbuf: a heap-based buffer overflow when compositing or clearing frames in GIF files. Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../gdk-pixbuf/CVE-2021-46829.patch | 61 +++++++++++++++++++ .../gdk-pixbuf/gdk-pixbuf_2.42.6.bb | 1 + 2 files changed, 62 insertions(+) create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-46829.patch diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-46829.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-46829.patch new file mode 100644 index 0000000000..82ceae6348 --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/CVE-2021-46829.patch @@ -0,0 +1,61 @@ +From dc296a24862c2bcfbfbd642abbb4826ec282f0a1 Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Mon, 8 Aug 2022 17:28:21 +0530 +Subject: [PATCH] CVE-2021-46829 + +Upstream-Status: Backport [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/commit/5398f04d772f7f8baf5265715696ed88db0f0512] +CVE: CVE-2021-46829 +Signed-off-by: Hitendra Prajapati +--- + gdk-pixbuf/io-gif-animation.c | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) + +diff --git a/gdk-pixbuf/io-gif-animation.c b/gdk-pixbuf/io-gif-animation.c +index 8335cdd..71d9265 100644 +--- a/gdk-pixbuf/io-gif-animation.c ++++ b/gdk-pixbuf/io-gif-animation.c +@@ -369,7 +369,7 @@ composite_frame (GdkPixbufGifAnim *anim, GdkPixbufFrame *frame) + for (i = 0; i < n_indexes; i++) { + guint8 index = index_buffer[i]; + guint x, y; +- int offset; ++ gsize offset; + + if (index == frame->transparent_index) + continue; +@@ -379,11 +379,13 @@ composite_frame (GdkPixbufGifAnim *anim, GdkPixbufFrame *frame) + if (x >= anim->width || y >= anim->height) + continue; + +- offset = y * gdk_pixbuf_get_rowstride (anim->last_frame_data) + x * 4; +- pixels[offset + 0] = frame->color_map[index * 3 + 0]; +- pixels[offset + 1] = frame->color_map[index * 3 + 1]; +- pixels[offset + 2] = frame->color_map[index * 3 + 2]; +- pixels[offset + 3] = 255; ++ if (g_size_checked_mul (&offset, gdk_pixbuf_get_rowstride (anim->last_frame_data), y) && ++ g_size_checked_add (&offset, offset, x * 4)) { ++ pixels[offset + 0] = frame->color_map[index * 3 + 0]; ++ pixels[offset + 1] = frame->color_map[index * 3 + 1]; ++ pixels[offset + 2] = frame->color_map[index * 3 + 2]; ++ pixels[offset + 3] = 255; ++ } + } + + out: +@@ -448,8 +450,11 @@ gdk_pixbuf_gif_anim_iter_get_pixbuf (GdkPixbufAnimationIter *anim_iter) + x_end = MIN (anim->last_frame->x_offset + anim->last_frame->width, anim->width); + y_end = MIN (anim->last_frame->y_offset + anim->last_frame->height, anim->height); + for (y = anim->last_frame->y_offset; y < y_end; y++) { +- guchar *line = pixels + y * gdk_pixbuf_get_rowstride (anim->last_frame_data) + anim->last_frame->x_offset * 4; +- memset (line, 0, (x_end - anim->last_frame->x_offset) * 4); ++ gsize offset; ++ if (g_size_checked_mul (&offset, gdk_pixbuf_get_rowstride (anim->last_frame_data), y) && ++ g_size_checked_add (&offset, offset, anim->last_frame->x_offset * 4)) { ++ memset (pixels + offset, 0, (x_end - anim->last_frame->x_offset) * 4); ++ } + } + break; + case GDK_PIXBUF_FRAME_REVERT: +-- +2.25.1 + diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb index 55c16e4d66..b5ff29b5e3 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.6.bb @@ -21,6 +21,7 @@ SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://run-ptest \ file://fatal-loader.patch \ file://0001-Add-use_prebuilt_tools-option.patch \ + file://CVE-2021-46829.patch \ " SRC_URI[sha256sum] = "c4a6b75b7ed8f58ca48da830b9fa00ed96d668d3ab4b1f723dcf902f78bde77f" From patchwork Fri Aug 19 02:42:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14273 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Steve Sakoman" Subject: [OE-core][kirkstone 02/26] qemu: fix CVE-2021-3507 Date: Thu, 18 Aug 2022 16:42:24 -1000 Message-Id: <8ad9e87ac78d5dab816e489c3e5581bbdc0d297c.1660876844.git.steve@sakoman.com> In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Sakib Sajal Backport relevant patches to fix CVE-2021-3507. Signed-off-by: Sakib Sajal Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 2 + .../qemu/qemu/CVE-2021-3507_1.patch | 92 ++++++++++++++ .../qemu/qemu/CVE-2021-3507_2.patch | 115 ++++++++++++++++++ 3 files changed, 209 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3507_1.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3507_2.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 54a68e1730..dd30313fdd 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -36,6 +36,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2021-4206.patch \ file://CVE-2021-4207.patch \ file://CVE-2022-35414.patch \ + file://CVE-2021-3507_1.patch \ + file://CVE-2021-3507_2.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_1.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_1.patch new file mode 100644 index 0000000000..4201610f4d --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_1.patch @@ -0,0 +1,92 @@ +From 963ac2cd5186b28fbfdecd15ac43afe1dbaf871a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= +Date: Thu, 18 Nov 2021 12:57:32 +0100 +Subject: [PATCH 1/2] hw/block/fdc: Prevent end-of-track overrun + (CVE-2021-3507) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Per the 82078 datasheet, if the end-of-track (EOT byte in +the FIFO) is more than the number of sectors per side, the +command is terminated unsuccessfully: + +* 5.2.5 DATA TRANSFER TERMINATION + + The 82078 supports terminal count explicitly through + the TC pin and implicitly through the underrun/over- + run and end-of-track (EOT) functions. For full sector + transfers, the EOT parameter can define the last + sector to be transferred in a single or multisector + transfer. If the last sector to be transferred is a par- + tial sector, the host can stop transferring the data in + mid-sector, and the 82078 will continue to complete + the sector as if a hardware TC was received. The + only difference between these implicit functions and + TC is that they return "abnormal termination" result + status. Such status indications can be ignored if they + were expected. + +* 6.1.3 READ TRACK + + This command terminates when the EOT specified + number of sectors have been read. If the 82078 + does not find an I D Address Mark on the diskette + after the second· occurrence of a pulse on the + INDX# pin, then it sets the IC code in Status Regis- + ter 0 to "01" (Abnormal termination), sets the MA bit + in Status Register 1 to "1", and terminates the com- + mand. + +* 6.1.6 VERIFY + + Refer to Table 6-6 and Table 6-7 for information + concerning the values of MT and EC versus SC and + EOT value. + +* Table 6·6. Result Phase Table + +* Table 6-7. Verify Command Result Phase Table + +Fix by aborting the transfer when EOT > # Sectors Per Side. + +Cc: qemu-stable@nongnu.org +Cc: Hervé Poussineau +Fixes: baca51faff0 ("floppy driver: disk geometry auto detect") +Reported-by: Alexander Bulekov +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/339 +Signed-off-by: Philippe Mathieu-Daudé +Message-Id: <20211118115733.4038610-2-philmd@redhat.com> +Reviewed-by: Hanna Reitz +Signed-off-by: Kevin Wolf + +Upstream-Status: Backport [defac5e2fbddf8423a354ff0454283a2115e1367] +CVE: CVE-2021-3507 + +Signed-off-by: Sakib Sajal +--- + hw/block/fdc.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/hw/block/fdc.c b/hw/block/fdc.c +index 21d18ac2e..24b05406e 100644 +--- a/hw/block/fdc.c ++++ b/hw/block/fdc.c +@@ -1529,6 +1529,14 @@ static void fdctrl_start_transfer(FDCtrl *fdctrl, int direction) + int tmp; + fdctrl->data_len = 128 << (fdctrl->fifo[5] > 7 ? 7 : fdctrl->fifo[5]); + tmp = (fdctrl->fifo[6] - ks + 1); ++ if (tmp < 0) { ++ FLOPPY_DPRINTF("invalid EOT: %d\n", tmp); ++ fdctrl_stop_transfer(fdctrl, FD_SR0_ABNTERM, FD_SR1_MA, 0x00); ++ fdctrl->fifo[3] = kt; ++ fdctrl->fifo[4] = kh; ++ fdctrl->fifo[5] = ks; ++ return; ++ } + if (fdctrl->fifo[0] & 0x80) + tmp += fdctrl->fifo[6]; + fdctrl->data_len *= tmp; +-- +2.33.0 + diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_2.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_2.patch new file mode 100644 index 0000000000..9f00d9c0d0 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3507_2.patch @@ -0,0 +1,115 @@ +From ec5725982f811d9728ad1f9940df0e9349397e67 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= +Date: Thu, 18 Nov 2021 12:57:33 +0100 +Subject: [PATCH 2/2] tests/qtest/fdc-test: Add a regression test for + CVE-2021-3507 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Add the reproducer from https://gitlab.com/qemu-project/qemu/-/issues/339 + +Without the previous commit, when running 'make check-qtest-i386' +with QEMU configured with '--enable-sanitizers' we get: + + ==4028352==ERROR: AddressSanitizer: heap-buffer-overflow on address 0x619000062a00 at pc 0x5626d03c491a bp 0x7ffdb4199410 sp 0x7ffdb4198bc0 + READ of size 786432 at 0x619000062a00 thread T0 + #0 0x5626d03c4919 in __asan_memcpy (qemu-system-i386+0x1e65919) + #1 0x5626d1c023cc in flatview_write_continue softmmu/physmem.c:2787:13 + #2 0x5626d1bf0c0f in flatview_write softmmu/physmem.c:2822:14 + #3 0x5626d1bf0798 in address_space_write softmmu/physmem.c:2914:18 + #4 0x5626d1bf0f37 in address_space_rw softmmu/physmem.c:2924:16 + #5 0x5626d1bf14c8 in cpu_physical_memory_rw softmmu/physmem.c:2933:5 + #6 0x5626d0bd5649 in cpu_physical_memory_write include/exec/cpu-common.h:82:5 + #7 0x5626d0bd0a07 in i8257_dma_write_memory hw/dma/i8257.c:452:9 + #8 0x5626d09f825d in fdctrl_transfer_handler hw/block/fdc.c:1616:13 + #9 0x5626d0a048b4 in fdctrl_start_transfer hw/block/fdc.c:1539:13 + #10 0x5626d09f4c3e in fdctrl_write_data hw/block/fdc.c:2266:13 + #11 0x5626d09f22f7 in fdctrl_write hw/block/fdc.c:829:9 + #12 0x5626d1c20bc5 in portio_write softmmu/ioport.c:207:17 + + 0x619000062a00 is located 0 bytes to the right of 512-byte region [0x619000062800,0x619000062a00) + allocated by thread T0 here: + #0 0x5626d03c66ec in posix_memalign (qemu-system-i386+0x1e676ec) + #1 0x5626d2b988d4 in qemu_try_memalign util/oslib-posix.c:210:11 + #2 0x5626d2b98b0c in qemu_memalign util/oslib-posix.c:226:27 + #3 0x5626d09fbaf0 in fdctrl_realize_common hw/block/fdc.c:2341:20 + #4 0x5626d0a150ed in isabus_fdc_realize hw/block/fdc-isa.c:113:5 + #5 0x5626d2367935 in device_set_realized hw/core/qdev.c:531:13 + + SUMMARY: AddressSanitizer: heap-buffer-overflow (qemu-system-i386+0x1e65919) in __asan_memcpy + Shadow bytes around the buggy address: + 0x0c32800044f0: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c3280004500: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 0x0c3280004510: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 0x0c3280004520: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + 0x0c3280004530: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 + =>0x0c3280004540:[fa]fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c3280004550: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c3280004560: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c3280004570: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c3280004580: fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa fa + 0x0c3280004590: fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd fd + Shadow byte legend (one shadow byte represents 8 application bytes): + Addressable: 00 + Heap left redzone: fa + Freed heap region: fd + ==4028352==ABORTING + +[ kwolf: Added snapshot=on to prevent write file lock failure ] + +Reported-by: Alexander Bulekov +Signed-off-by: Philippe Mathieu-Daudé +Reviewed-by: Alexander Bulekov +Signed-off-by: Kevin Wolf + +Upstream-Status: Backport [46609b90d9e3a6304def11038a76b58ff43f77bc] +CVE: CVE-2021-3507 + +Signed-off-by: Sakib Sajal +--- + tests/qtest/fdc-test.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) + +diff --git a/tests/qtest/fdc-test.c b/tests/qtest/fdc-test.c +index 8f6eee84a..6f5850354 100644 +--- a/tests/qtest/fdc-test.c ++++ b/tests/qtest/fdc-test.c +@@ -583,6 +583,26 @@ static void test_cve_2021_20196(void) + qtest_quit(s); + } + ++static void test_cve_2021_3507(void) ++{ ++ QTestState *s; ++ ++ s = qtest_initf("-nographic -m 32M -nodefaults " ++ "-drive file=%s,format=raw,if=floppy,snapshot=on", ++ test_image); ++ qtest_outl(s, 0x9, 0x0a0206); ++ qtest_outw(s, 0x3f4, 0x1600); ++ qtest_outw(s, 0x3f4, 0x0000); ++ qtest_outw(s, 0x3f4, 0x0000); ++ qtest_outw(s, 0x3f4, 0x0000); ++ qtest_outw(s, 0x3f4, 0x0200); ++ qtest_outw(s, 0x3f4, 0x0200); ++ qtest_outw(s, 0x3f4, 0x0000); ++ qtest_outw(s, 0x3f4, 0x0000); ++ qtest_outw(s, 0x3f4, 0x0000); ++ qtest_quit(s); ++} ++ + int main(int argc, char **argv) + { + int fd; +@@ -614,6 +634,7 @@ int main(int argc, char **argv) + qtest_add_func("/fdc/read_no_dma_19", test_read_no_dma_19); + qtest_add_func("/fdc/fuzz-registers", fuzz_registers); + qtest_add_func("/fdc/fuzz/cve_2021_20196", test_cve_2021_20196); ++ qtest_add_func("/fdc/fuzz/cve_2021_3507", test_cve_2021_3507); + + ret = g_test_run(); + +-- +2.33.0 + From patchwork Fri Aug 19 02:42:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14274 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Steve Sakoman" Subject: [OE-core][kirkstone 03/26] qemu: fix CVE-2021-3929 Date: Thu, 18 Aug 2022 16:42:25 -1000 Message-Id: <3be3101ab1be2be58b6f27a28ca8e1ade3aff853.1660876844.git.steve@sakoman.com> In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Sakib Sajal Backport patch to fix CVE-2021-3929. Signed-off-by: Sakib Sajal Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2021-3929.patch | 70 +++++++++++++++++++ 2 files changed, 71 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-3929.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index dd30313fdd..53bad5c453 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -38,6 +38,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2022-35414.patch \ file://CVE-2021-3507_1.patch \ file://CVE-2021-3507_2.patch \ + file://CVE-2021-3929.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-3929.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-3929.patch new file mode 100644 index 0000000000..7555e5bc40 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-3929.patch @@ -0,0 +1,70 @@ +From 12daeafc9868c1ebe482d580494f9e6d3d5c260f Mon Sep 17 00:00:00 2001 +From: Klaus Jensen +Date: Fri, 17 Dec 2021 10:44:01 +0100 +Subject: [PATCH] hw/nvme: fix CVE-2021-3929 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes CVE-2021-3929 "locally" by denying DMA to the iomem of the +device itself. This still allows DMA to MMIO regions of other devices +(e.g. doing P2P DMA to the controller memory buffer of another NVMe +device). + +Fixes: CVE-2021-3929 +Reported-by: Qiuhao Li +Reviewed-by: Keith Busch +Reviewed-by: Philippe Mathieu-Daudé +Signed-off-by: Klaus Jensen + +Upstream-Status: Backport [736b01642d85be832385063f278fe7cd4ffb5221] +CVE: CVE-2021-3929 + +Signed-off-by: Sakib Sajal +--- + hw/nvme/ctrl.c | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) + +diff --git a/hw/nvme/ctrl.c b/hw/nvme/ctrl.c +index 5f573c417..eda52c6ac 100644 +--- a/hw/nvme/ctrl.c ++++ b/hw/nvme/ctrl.c +@@ -357,6 +357,24 @@ static inline void *nvme_addr_to_pmr(NvmeCtrl *n, hwaddr addr) + return memory_region_get_ram_ptr(&n->pmr.dev->mr) + (addr - n->pmr.cba); + } + ++static inline bool nvme_addr_is_iomem(NvmeCtrl *n, hwaddr addr) ++{ ++ hwaddr hi, lo; ++ ++ /* ++ * The purpose of this check is to guard against invalid "local" access to ++ * the iomem (i.e. controller registers). Thus, we check against the range ++ * covered by the 'bar0' MemoryRegion since that is currently composed of ++ * two subregions (the NVMe "MBAR" and the MSI-X table/pba). Note, however, ++ * that if the device model is ever changed to allow the CMB to be located ++ * in BAR0 as well, then this must be changed. ++ */ ++ lo = n->bar0.addr; ++ hi = lo + int128_get64(n->bar0.size); ++ ++ return addr >= lo && addr < hi; ++} ++ + static int nvme_addr_read(NvmeCtrl *n, hwaddr addr, void *buf, int size) + { + hwaddr hi = addr + size - 1; +@@ -614,6 +632,10 @@ static uint16_t nvme_map_addr(NvmeCtrl *n, NvmeSg *sg, hwaddr addr, size_t len) + + trace_pci_nvme_map_addr(addr, len); + ++ if (nvme_addr_is_iomem(n, addr)) { ++ return NVME_DATA_TRAS_ERROR; ++ } ++ + if (nvme_addr_is_cmb(n, addr)) { + cmb = true; + } else if (nvme_addr_is_pmr(n, addr)) { +-- +2.33.0 + From patchwork Fri Aug 19 02:42:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 14275 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Steve Sakoman" Subject: [OE-core][kirkstone 04/26] qemu: fix CVE-2021-4158 Date: Thu, 18 Aug 2022 16:42:26 -1000 Message-Id: In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Sakib Sajal Backport patch to fix CVE-2021-4158. Signed-off-by: Sakib Sajal Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2021-4158.patch | 46 +++++++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2021-4158.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 53bad5c453..1d04ad3c67 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -39,6 +39,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2021-3507_1.patch \ file://CVE-2021-3507_2.patch \ file://CVE-2021-3929.patch \ + file://CVE-2021-4158.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2021-4158.patch b/meta/recipes-devtools/qemu/qemu/CVE-2021-4158.patch new file mode 100644 index 0000000000..f6de53244f --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2021-4158.patch @@ -0,0 +1,46 @@ +From a0b64c6d078acb9bcfae600e22bf99a9a7deca7c Mon Sep 17 00:00:00 2001 +From: "Michael S. Tsirkin" +Date: Tue, 21 Dec 2021 09:45:44 -0500 +Subject: [PATCH] acpi: validate hotplug selector on access +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When bus is looked up on a pci write, we didn't +validate that the lookup succeeded. +Fuzzers thus can trigger QEMU crash by dereferencing the NULL +bus pointer. + +Fixes: b32bd763a1 ("pci: introduce acpi-index property for PCI device") +Fixes: CVE-2021-4158 +Cc: "Igor Mammedov" +Fixes: https://gitlab.com/qemu-project/qemu/-/issues/770 +Signed-off-by: Michael S. Tsirkin +Reviewed-by: Philippe Mathieu-Daudé +Reviewed-by: Ani Sinha + +Upstream-Status: Backport [9bd6565ccee68f72d5012e24646e12a1c662827e] +CVE: CVE-2021-4158 + +Signed-off-by: Sakib Sajal +--- + hw/acpi/pcihp.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c +index 30405b511..a5e182dd3 100644 +--- a/hw/acpi/pcihp.c ++++ b/hw/acpi/pcihp.c +@@ -491,6 +491,9 @@ static void pci_write(void *opaque, hwaddr addr, uint64_t data, + } + + bus = acpi_pcihp_find_hotplug_bus(s, s->hotplug_select); ++ if (!bus) { ++ break; ++ } + QTAILQ_FOREACH_SAFE(kid, &bus->qbus.children, sibling, next) { + Object *o = OBJECT(kid->child); + PCIDevice *dev = PCI_DEVICE(o); +-- +2.33.0 + From patchwork Fri Aug 19 02:42:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11572 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 7F46FC28B2B for ; Fri, 19 Aug 2022 02:43:25 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web11.50678.1660876991985982681 for ; Thu, 18 Aug 2022 19:43:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=24isGWON; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id p9so2101627pfq.13 for ; Thu, 18 Aug 2022 19:43:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=IQkRUIn/iSyyn91OEC03cHf31+jNIRroWueFunKCITI=; b=24isGWONeqegN3vpEM4KSaWDvwAS+rClH676Ut2T5uD/BHTu0HiE9jIQ5JwwVIvR75 Jtr8ZtSBoTKbAsa6Ml3r9jJOkLr+Ts8su3jmgkG6COj1cOKr/6wKx8PmFkFItRvosk3D wJ5W9clgEFKd5n5FPkLe5a5CEXhdjDrh63/rAc+5YFN1CUleYwF8TFQqgd7lEc+cFQL7 EN9pUZL7C6nm51rng76GKcbMQmQVgQ43qSlTUULMSj+Bgut46PFx2/H9vKDU7V7JgHUW cUAZ5vmLuG9SRbsActyrBDW2dBRzyML8K0+t2Z3WnNTvoxG06gYV7gltL9Pcegb4V0IG 5ygQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=IQkRUIn/iSyyn91OEC03cHf31+jNIRroWueFunKCITI=; b=jzrYKn3xfy+4f8mKx45YvwUs3NKq5qYZiFsLFdIfNcplzLgrwmaeSTyA7ZOYRxDRdv u6Tf+3KctaayVCA9PK9+MBHN/+oPsjF1NNU5eEoJIvSrpBPMtdSMaFY/fIn2vjA6F71P bSqMDTJy5jvVlll7PRFhCXoyj0b7iTya1ut4Pwcy9y3sBJmwZpKellKWVTtJ/UiC82hR Gan7PFjnjh3yFA6+duw2+UiiiHI85fl+1Bh746JpI/jqN10u9dZ4kIuCFxAmMVzFCE+G LgN6vgEImVQvfkAWAVzFZVaLu07ZR8573RL+eJDkDF7DDxm8uBlEGn8aqQTdWbZfmdT5 T2kQ== X-Gm-Message-State: ACgBeo2A2Y25GrfBHQXrvMLEYvBAwCsUT69+dxPPEL0Nl+PjZUkBuqRC 7mf05PR+NTR4IDY/FjEpbJvhbuRGKWxfviJu X-Google-Smtp-Source: AA6agR7pcTAb0MlmZhAthgI7d/j3KWPfwptzYFqoysXd/kI5Ro36Yf5fp0yLYbC8FLwk008iWvR4Rw== X-Received: by 2002:a63:1e61:0:b0:41c:45d:7d50 with SMTP id p33-20020a631e61000000b0041c045d7d50mr4421097pgm.507.1660876997640; Thu, 18 Aug 2022 19:43:17 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:17 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/26] qemu: fix CVE-2022-0358 Date: Thu, 18 Aug 2022 16:42:27 -1000 Message-Id: <99c4b60bc0266d131307e689ad3651497b3bca29.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169548 From: Sakib Sajal Backport patch to fix CVE-2022-0358. Signed-off-by: Sakib Sajal Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2022-0358.patch | 106 ++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-0358.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 1d04ad3c67..44d4c9ca2f 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -40,6 +40,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2021-3507_2.patch \ file://CVE-2021-3929.patch \ file://CVE-2021-4158.patch \ + file://CVE-2022-0358.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2022-0358.patch b/meta/recipes-devtools/qemu/qemu/CVE-2022-0358.patch new file mode 100644 index 0000000000..8eb1475638 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2022-0358.patch @@ -0,0 +1,106 @@ +From 4d2558ec9336d3614a43f7437c9cf74793ae3a87 Mon Sep 17 00:00:00 2001 +From: Vivek Goyal +Date: Tue, 25 Jan 2022 13:51:14 -0500 +Subject: [PATCH] virtiofsd: Drop membership of all supplementary groups + (CVE-2022-0358) + +At the start, drop membership of all supplementary groups. This is +not required. + +If we have membership of "root" supplementary group and when we switch +uid/gid using setresuid/setsgid, we still retain membership of existing +supplemntary groups. And that can allow some operations which are not +normally allowed. + +For example, if root in guest creates a dir as follows. + +$ mkdir -m 03777 test_dir + +This sets SGID on dir as well as allows unprivileged users to write into +this dir. + +And now as unprivileged user open file as follows. + +$ su test +$ fd = open("test_dir/priviledge_id", O_RDWR|O_CREAT|O_EXCL, 02755); + +This will create SGID set executable in test_dir/. + +And that's a problem because now an unpriviliged user can execute it, +get egid=0 and get access to resources owned by "root" group. This is +privilege escalation. + +Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2044863 +Fixes: CVE-2022-0358 +Reported-by: JIETAO XIAO +Suggested-by: Miklos Szeredi +Reviewed-by: Stefan Hajnoczi +Reviewed-by: Dr. David Alan Gilbert +Signed-off-by: Vivek Goyal +Message-Id: +Signed-off-by: Dr. David Alan Gilbert + dgilbert: Fixed missing {}'s style nit + +Upstream-Status: Backport [449e8171f96a6a944d1f3b7d3627ae059eae21ca] +CVE: CVE-2022-0358 + +Signed-off-by: Sakib Sajal +--- + tools/virtiofsd/passthrough_ll.c | 27 +++++++++++++++++++++++++++ + 1 file changed, 27 insertions(+) + +diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c +index 64b5b4fbb..b3d0674f6 100644 +--- a/tools/virtiofsd/passthrough_ll.c ++++ b/tools/virtiofsd/passthrough_ll.c +@@ -54,6 +54,7 @@ + #include + #include + #include ++#include + + #include "qemu/cutils.h" + #include "passthrough_helpers.h" +@@ -1161,6 +1162,30 @@ static void lo_lookup(fuse_req_t req, fuse_ino_t parent, const char *name) + #define OURSYS_setresuid SYS_setresuid + #endif + ++static void drop_supplementary_groups(void) ++{ ++ int ret; ++ ++ ret = getgroups(0, NULL); ++ if (ret == -1) { ++ fuse_log(FUSE_LOG_ERR, "getgroups() failed with error=%d:%s\n", ++ errno, strerror(errno)); ++ exit(1); ++ } ++ ++ if (!ret) { ++ return; ++ } ++ ++ /* Drop all supplementary groups. We should not need it */ ++ ret = setgroups(0, NULL); ++ if (ret == -1) { ++ fuse_log(FUSE_LOG_ERR, "setgroups() failed with error=%d:%s\n", ++ errno, strerror(errno)); ++ exit(1); ++ } ++} ++ + /* + * Change to uid/gid of caller so that file is created with + * ownership of caller. +@@ -3926,6 +3951,8 @@ int main(int argc, char *argv[]) + + qemu_init_exec_dir(argv[0]); + ++ drop_supplementary_groups(); ++ + pthread_mutex_init(&lo.mutex, NULL); + lo.inodes = g_hash_table_new(lo_key_hash, lo_key_equal); + lo.root.fd = -1; +-- +2.33.0 + From patchwork Fri Aug 19 02:42:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11574 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 7AA2AC3F6B0 for ; Fri, 19 Aug 2022 02:43:25 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web09.51213.1660877000688735199 for ; Thu, 18 Aug 2022 19:43:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=o5qwjdhK; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id x63-20020a17090a6c4500b001fabbf8debfso3593826pjj.4 for ; Thu, 18 Aug 2022 19:43:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=/qw95IdSb2ze0viP4pfiKpRgKKGktUia2/Xz6o4+iRs=; b=o5qwjdhKEY2/CGimEdFFBia/4L+0ogt04Hxtqvbe26WvliNCtNg8CbV5TPVc+mennT OQIwR+z6NHcEIBILavWkhok+O96uUafPae2ho+Lba9MJO3YuqGJJI2cKvoT9lmpyvXxg Hsf76g8pxwEknGjSuPFx0OSqnbrL8j2ddlfHq3efpewmhAVjAEhX8wPdWHq6K2XwcLF1 xuPfuEBjQrZxODjoiuYafS4IuUU9tu0fanYLfH/9dL062nqW3BNQgUPznKhdJab3i6cd TvDdNOK5MG6aAxKu/AHzLwHiA+Eb/KTyEFiImEOm+N6BPkm6gTM3FStv4tqKGzjOHGZB eAhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=/qw95IdSb2ze0viP4pfiKpRgKKGktUia2/Xz6o4+iRs=; b=1XIQMp4oZ02I288dWImAOxLQC2eG8kgu6GQLA5SrovquHIBKOgz1r60cct1Su6UBCL wtynicLJtgr9cQNUjEjCruE0KfCK0/gf/2+QsXQwSZdGdT5YAMEzSlGffQeB76WhEGi8 8Y2f4Qie5MJnjBAX0T680no8+Q75JbUmy5jKyZzlYXV5q3gP82gyZFykHfE05Pu6ueAC Gm2xkhTbdAumsGY//UuRBt1omoYcMWEsknDuQzZsLMw6XwF5hrZjVv4xvlENCGfHu/tg bH48ecnOax/Zxms/pSpjii0dWwQ83++2PxKGgZJ9yineZQE98iFuhBne2cMBY79pE7lk Co9Q== X-Gm-Message-State: ACgBeo0PehwlbCM3MF26iLNMVHbn/iaUVKaGvkAqXHlKDGxscYM6jl/5 Mqs/UWetRIlkcKutz2+6OWyybH88xS7orus3 X-Google-Smtp-Source: AA6agR5k5XixXMyxnKBjcyIhwfRnMPpF2sR0yBRhY4QaatN1RX97/ybPgJthFQk7SWS6c9VVEXuwuQ== X-Received: by 2002:a17:90b:180f:b0:1f5:160c:a656 with SMTP id lw15-20020a17090b180f00b001f5160ca656mr11990253pjb.193.1660876999704; Thu, 18 Aug 2022 19:43:19 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:19 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/26] qemu: fix CVE-2022-0216 Date: Thu, 18 Aug 2022 16:42:28 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169549 From: Sakib Sajal Backport relevant patches to fix CVE-2022-0216. Signed-off-by: Sakib Sajal Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 2 + .../qemu/qemu/CVE-2022-0216_1.patch | 42 +++++++++++++++ .../qemu/qemu/CVE-2022-0216_2.patch | 52 +++++++++++++++++++ 3 files changed, 96 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-0216_1.patch create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2022-0216_2.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 44d4c9ca2f..a493ac8add 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -41,6 +41,8 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2021-3929.patch \ file://CVE-2021-4158.patch \ file://CVE-2022-0358.patch \ + file://CVE-2022-0216_1.patch \ + file://CVE-2022-0216_2.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_1.patch b/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_1.patch new file mode 100644 index 0000000000..de7458fc72 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_1.patch @@ -0,0 +1,42 @@ +From 1cedc914b2c4b4e0c9dfcd1b0e02917af35b5eb6 Mon Sep 17 00:00:00 2001 +From: Mauro Matteo Cascella +Date: Tue, 5 Jul 2022 22:05:43 +0200 +Subject: [PATCH 1/3] scsi/lsi53c895a: fix use-after-free in lsi_do_msgout + (CVE-2022-0216) + +Set current_req->req to NULL to prevent reusing a free'd buffer in case of +repeated SCSI cancel requests. Thanks to Thomas Huth for suggesting the patch. + +Fixes: CVE-2022-0216 +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/972 +Signed-off-by: Mauro Matteo Cascella +Reviewed-by: Thomas Huth +Message-Id: <20220705200543.2366809-1-mcascell@redhat.com> +Signed-off-by: Paolo Bonzini + +Upstream-Status: Backport [6c8fa961da5e60f574bb52fd3ad44b1e9e8ad4b8] +CVE: CVE-2022-0216 + +Signed-off-by: Sakib Sajal +--- + hw/scsi/lsi53c895a.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c +index 85e907a78..8033cf050 100644 +--- a/hw/scsi/lsi53c895a.c ++++ b/hw/scsi/lsi53c895a.c +@@ -1029,8 +1029,9 @@ static void lsi_do_msgout(LSIState *s) + case 0x0d: + /* The ABORT TAG message clears the current I/O process only. */ + trace_lsi_do_msgout_abort(current_tag); +- if (current_req) { ++ if (current_req && current_req->req) { + scsi_req_cancel(current_req->req); ++ current_req->req = NULL; + } + lsi_disconnect(s); + break; +-- +2.33.0 + diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_2.patch b/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_2.patch new file mode 100644 index 0000000000..12f5a602da --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2022-0216_2.patch @@ -0,0 +1,52 @@ +From 8f2c2cb908758192d5ebc00605cbf0989b8a507c Mon Sep 17 00:00:00 2001 +From: Mauro Matteo Cascella +Date: Mon, 11 Jul 2022 14:33:16 +0200 +Subject: [PATCH 3/3] scsi/lsi53c895a: really fix use-after-free in + lsi_do_msgout (CVE-2022-0216) + +Set current_req to NULL, not current_req->req, to prevent reusing a free'd +buffer in case of repeated SCSI cancel requests. Also apply the fix to +CLEAR QUEUE and BUS DEVICE RESET messages as well, since they also cancel +the request. + +Thanks to Alexander Bulekov for providing a reproducer. + +Fixes: CVE-2022-0216 +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/972 +Signed-off-by: Mauro Matteo Cascella +Tested-by: Alexander Bulekov +Message-Id: <20220711123316.421279-1-mcascell@redhat.com> +Signed-off-by: Paolo Bonzini + +Upstream-Status: Backport [4367a20cc442c56b05611b4224de9a61908f9eac] +CVE: CVE-2022-0216 + +Signed-off-by: Sakib Sajal +--- + hw/scsi/lsi53c895a.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/hw/scsi/lsi53c895a.c b/hw/scsi/lsi53c895a.c +index 8033cf050..fbe3fa3dd 100644 +--- a/hw/scsi/lsi53c895a.c ++++ b/hw/scsi/lsi53c895a.c +@@ -1031,7 +1031,7 @@ static void lsi_do_msgout(LSIState *s) + trace_lsi_do_msgout_abort(current_tag); + if (current_req && current_req->req) { + scsi_req_cancel(current_req->req); +- current_req->req = NULL; ++ current_req = NULL; + } + lsi_disconnect(s); + break; +@@ -1057,6 +1057,7 @@ static void lsi_do_msgout(LSIState *s) + /* clear the current I/O process */ + if (s->current) { + scsi_req_cancel(s->current->req); ++ current_req = NULL; + } + + /* As the current implemented devices scsi_disk and scsi_generic +-- +2.33.0 + From patchwork Fri Aug 19 02:42:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11573 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 74C97C00140 for ; Fri, 19 Aug 2022 02:43:25 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web09.51215.1660877003090693380 for ; Thu, 18 Aug 2022 19:43:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=HhWd5ePD; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id t2-20020a17090a4e4200b001f21572f3a4so3635840pjl.0 for ; Thu, 18 Aug 2022 19:43:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=6mnlaCvz5OUk8Q0nft4PENQcW7yr78w357nP21sZkcc=; b=HhWd5ePDtppGZyP3bPOmgf+BBL6MLvBPYT5IyPjkAPkWAv8NGnQeXydGgUiA7hrN7O zNG8AswTPifL03nfy9lnnHrBs7rmJrbB85Dq3alGNCnqC2Oou/6jk1R40lFSjHk8pEfJ nVeSozevVcgiXkJsbgk3HGBE/mpFFK04HtFxmU+CfzBzdjDlP2ULniX1MMfnNjpiyUgP k7upoIIBs1TBp0Ch4as8XfmCUKhTtnaNayeaG3YAEElICeWd06WLLIEeeJqr3v/75E1S JV0Vy9iVr+EvoSxceLw+eQy7JcEoBfWGk8uJL0W1gUDDsZgR2qXq2SIvyCyJe0cYJ2Os WxZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=6mnlaCvz5OUk8Q0nft4PENQcW7yr78w357nP21sZkcc=; b=HaPvWeTZ2tGEVVzsjmRH9JT43UIPifIY/TDE3VAfhLcYXQ55mps+FxUDPoVoSRK6lt ZQP2CwdXu44hwEH93dCpE4dM4Ei/p6Ci/unMlMQw/a4B8rXzaO04cyTQybavReZccN3X W2md9S5BPLbwnnvPPvZauPQ/FNJyMcR2tUoSl0ljpGTwsEWJmfcgXwF/ZsN4jlv71sHj XnhDBWyt5ffrO4VaFEgr0uk79/bE6ZMFA6GkKaoGbSg5UsipBt1Mq5YFLIC9GebEDSRD O1FJov7vZ6W8JM+tASlVEY8vOBy0BnqkQvuyGgu1RO/RhEqHqiFjtbBCbgiA/pdO3/5r Ys0A== X-Gm-Message-State: ACgBeo3lV1+K2EEMV8+r8n8f22flojqMHE9pIh4BTKmNbptpkgmrM8mU kfA1gA07xhQ1SlhdmrS9flInjgGwOjntILJm X-Google-Smtp-Source: AA6agR6qp5zziVrhoH53xLaAb50iu/DphvkEoPMpiFYYotzlKzdEoR/n+3mJIV6I/SQqYBqylA1nZA== X-Received: by 2002:a17:90a:982:b0:1ef:f525:9801 with SMTP id 2-20020a17090a098200b001eff5259801mr6103168pjo.191.1660877002036; Thu, 18 Aug 2022 19:43:22 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/26] u-boot: fix CVE-2022-33103 Date: Thu, 18 Aug 2022 16:42:29 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169550 From: Sakib Sajal Backport patch to resolve CVE-2022-33103. Signed-off-by: Sakib Sajal Signed-off-by: Steve Sakoman --- ..._read-Prevent-arbitrary-code-executi.patch | 80 +++++++++++++++++++ meta/recipes-bsp/u-boot/u-boot_2022.01.bb | 1 + 2 files changed, 81 insertions(+) create mode 100644 meta/recipes-bsp/u-boot/files/0001-fs-squashfs-sqfs_read-Prevent-arbitrary-code-executi.patch diff --git a/meta/recipes-bsp/u-boot/files/0001-fs-squashfs-sqfs_read-Prevent-arbitrary-code-executi.patch b/meta/recipes-bsp/u-boot/files/0001-fs-squashfs-sqfs_read-Prevent-arbitrary-code-executi.patch new file mode 100644 index 0000000000..b1650f6baa --- /dev/null +++ b/meta/recipes-bsp/u-boot/files/0001-fs-squashfs-sqfs_read-Prevent-arbitrary-code-executi.patch @@ -0,0 +1,80 @@ +From 65f1066f5abe291c7b10b6075fd60776074a38a9 Mon Sep 17 00:00:00 2001 +From: Miquel Raynal +Date: Thu, 9 Jun 2022 16:02:06 +0200 +Subject: [PATCH] fs/squashfs: sqfs_read: Prevent arbitrary code execution + +Following Jincheng's report, an out-of-band write leading to arbitrary +code execution is possible because on one side the squashfs logic +accepts directory names up to 65535 bytes (u16), while U-Boot fs logic +accepts directory names up to 255 bytes long. + +Prevent such an exploit from happening by capping directory name sizes +to 255. Use a define for this purpose so that developers can link the +limitation to its source and eventually kill it some day by dynamically +allocating this array (if ever desired). + +Link: https://lore.kernel.org/all/CALO=DHFB+yBoXxVr5KcsK0iFdg+e7ywko4-e+72kjbcS8JBfPw@mail.gmail.com +Reported-by: Jincheng Wang +Signed-off-by: Miquel Raynal +Tested-by: Jincheng Wang + +CVE: CVE-2022-33103 +Upstream-Status: Backport [2ac0baab4aff1a0b45067d0b62f00c15f4e86856] + +Signed-off-by: Sakib Sajal +--- + fs/squashfs/sqfs.c | 8 +++++--- + include/fs.h | 4 +++- + 2 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c +index e2d91c654c..a145d754cc 100644 +--- a/fs/squashfs/sqfs.c ++++ b/fs/squashfs/sqfs.c +@@ -973,6 +973,7 @@ int sqfs_readdir(struct fs_dir_stream *fs_dirs, struct fs_dirent **dentp) + int i_number, offset = 0, ret; + struct fs_dirent *dent; + unsigned char *ipos; ++ u16 name_size; + + dirs = (struct squashfs_dir_stream *)fs_dirs; + if (!dirs->size) { +@@ -1055,9 +1056,10 @@ int sqfs_readdir(struct fs_dir_stream *fs_dirs, struct fs_dirent **dentp) + return -SQFS_STOP_READDIR; + } + +- /* Set entry name */ +- strncpy(dent->name, dirs->entry->name, dirs->entry->name_size + 1); +- dent->name[dirs->entry->name_size + 1] = '\0'; ++ /* Set entry name (capped at FS_DIRENT_NAME_LEN which is a U-Boot limitation) */ ++ name_size = min_t(u16, dirs->entry->name_size + 1, FS_DIRENT_NAME_LEN - 1); ++ strncpy(dent->name, dirs->entry->name, name_size); ++ dent->name[name_size] = '\0'; + + offset = dirs->entry->name_size + 1 + SQFS_ENTRY_BASE_LENGTH; + dirs->entry_count--; +diff --git a/include/fs.h b/include/fs.h +index 1c79e299fd..6cb7ec89f4 100644 +--- a/include/fs.h ++++ b/include/fs.h +@@ -161,6 +161,8 @@ int fs_write(const char *filename, ulong addr, loff_t offset, loff_t len, + #define FS_DT_REG 8 /* regular file */ + #define FS_DT_LNK 10 /* symbolic link */ + ++#define FS_DIRENT_NAME_LEN 256 ++ + /** + * struct fs_dirent - directory entry + * +@@ -181,7 +183,7 @@ struct fs_dirent { + /** change_time: time of last modification */ + struct rtc_time change_time; + /** name: file name */ +- char name[256]; ++ char name[FS_DIRENT_NAME_LEN]; + }; + + /* Note: fs_dir_stream should be treated as opaque to the user of fs layer */ +-- +2.33.0 + diff --git a/meta/recipes-bsp/u-boot/u-boot_2022.01.bb b/meta/recipes-bsp/u-boot/u-boot_2022.01.bb index f2443723e2..a6a15d698f 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2022.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2022.01.bb @@ -4,6 +4,7 @@ require u-boot.inc SRC_URI:append = " file://0001-riscv32-Use-double-float-ABI-for-rv32.patch \ file://0001-riscv-fix-build-with-binutils-2.38.patch \ file://0001-i2c-fix-stack-buffer-overflow-vulnerability-in-i2c-m.patch \ + file://0001-fs-squashfs-sqfs_read-Prevent-arbitrary-code-executi.patch \ " DEPENDS += "bc-native dtc-native python3-setuptools-native" From patchwork Fri Aug 19 02:42:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11576 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 7A22DC28B2B for ; Fri, 19 Aug 2022 02:43:35 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web09.51218.1660877005707667355 for ; Thu, 18 Aug 2022 19:43:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=K3v7IqGk; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id u22so3023054plq.12 for ; Thu, 18 Aug 2022 19:43:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=aEKbu51DOMa+PJWiZQCzCXVN1/Mr2KmUtFYpV85Avuo=; b=K3v7IqGkHwkNz8GruQb7oIlqV3D7f+Rbn5u3l0STWZikL/vspIaI6g0dwWykVyd4+D jZQS1DUifhHkXQMALaYvgTa/8OJG8NiAWH7ODQOlDZ5hcTZHdSPw5sFDSBSP65zDnEK4 wJtZjLtY39sgBzuyeYRiSafheA6+o7XsEUhpIqFW9pHo69mCj98kQDCI3D+nxyJrfNbh eRItOJlM0BZJm2dufIgNRMT+Zux6pg+Pf7SV/w9Bjkea/4/3lKp2s54EgkFAtbmoP2dL dxt3IR3egKm8UyySq4X1wEvuJ9gZSBXI3MNPoe+sQkvZEhtrl2yeKagJ0LV8SZR0S3fb cy7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=aEKbu51DOMa+PJWiZQCzCXVN1/Mr2KmUtFYpV85Avuo=; b=47QJd7/IvrnGO7IEsBs/p8pkgJXuQ2FwjZr9iny9vYspTZzqG+ON+iEb93w3hRHHmP dDlXRBWwWXbbpBHNhthysjHCJsWIZFojff8cMpFiq661uX2Ka37XcMRoABdRb16cv5Cb cTcI6MmMc1G5CR1VMMacHqzLHLA1bzvOC/KqZFS860qlk7hf5X5y6Lgo2NI64MMmyKeF 9SOu48wU7JxDiPLXghcUyrDGE2K5J8qhfmXP8EzbS9Q/iBgKIvRupiC64Ulb4LJgEnuO 8YHd95DKFiJC/3sH+9FAU5qWFz9pDaDy4vEPkCeNOooV/l9MVfRMiCoGUZxzpT0lmNQ/ u8/Q== X-Gm-Message-State: ACgBeo25Zo5/lU9DtVoWYZYV9wmSLEO/oz8fsSEhHteS1OvLKczqmaBt eSc3CpkdXQUUvM8GYYs8C4bshTo1ybs5YDxX X-Google-Smtp-Source: AA6agR7nbCqCLKBETwB046gFwSE0Vj35n7oCjI9JP8rhrMN8KO4Sbq4SA1eJ6l2usdMdyd0S9Uy5hQ== X-Received: by 2002:a17:90b:350e:b0:1f5:1c63:b563 with SMTP id ls14-20020a17090b350e00b001f51c63b563mr6242186pjb.24.1660877004375; Thu, 18 Aug 2022 19:43:24 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/26] gnutls: CVE-2022-2509 Double free during gnutls_pkcs7_verify Date: Thu, 18 Aug 2022 16:42:30 -1000 Message-Id: <49781a79fd7764ef2e0d61ffa793acd59f210ecf.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169551 From: Hitendra Prajapati Source: https://gitlab.com/gnutls/gnutls MR: 120416 Type: Security Fix Disposition: Backport from https://gitlab.com/gnutls/gnutls/-/commit/ce37f9eb265dbe9b6d597f5767449e8ee95848e2 ChangeID: 703e01956915cf9543fdc47cfd5edb87403294f9 Description: CVE-2022-2509 gnutls: Double free during gnutls_pkcs7_verify. Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../gnutls/gnutls/CVE-2022-2509.patch | 282 ++++++++++++++++++ meta/recipes-support/gnutls/gnutls_3.7.4.bb | 1 + 2 files changed, 283 insertions(+) create mode 100644 meta/recipes-support/gnutls/gnutls/CVE-2022-2509.patch diff --git a/meta/recipes-support/gnutls/gnutls/CVE-2022-2509.patch b/meta/recipes-support/gnutls/gnutls/CVE-2022-2509.patch new file mode 100644 index 0000000000..c1c1def194 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls/CVE-2022-2509.patch @@ -0,0 +1,282 @@ +From 8161fec931f416f5ca6aa31bb53751e140a93046 Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Tue, 16 Aug 2022 16:56:15 +0530 +Subject: [PATCH] CVE-2022-2509 + +Upstream-Status: Backport [https://gitlab.com/gnutls/gnutls/-/commit/ce37f9eb265dbe9b6d597f5767449e8ee95848e2] +CVE: CVE-2022-2509 +Signed-off-by: Hitendra Prajapati +--- + NEWS | 4 + + lib/x509/pkcs7.c | 3 +- + tests/Makefile.am | 2 +- + tests/pkcs7-verify-double-free.c | 215 +++++++++++++++++++++++++++++++ + 4 files changed, 222 insertions(+), 2 deletions(-) + create mode 100644 tests/pkcs7-verify-double-free.c + +diff --git a/NEWS b/NEWS +index 36381f0..02c4040 100644 +--- a/NEWS ++++ b/NEWS +@@ -7,6 +7,10 @@ See the end for copying conditions. + + * Version 3.7.4 (released 2022-03-17) + ++** libgnutls: Fixed double free during verification of pkcs7 signatures. ++ Reported by Jaak Ristioja (#1383). [GNUTLS-SA-2022-07-07, CVSS: medium] ++ [CVE-2022-2509] ++ + ** libgnutls: Added support for certificate compression as defined in RFC8879. + ** certtool: Added option --compress-cert that allows user to specify compression + methods for certificate compression. +diff --git a/lib/x509/pkcs7.c b/lib/x509/pkcs7.c +index 1f35fab..d5be7f4 100644 +--- a/lib/x509/pkcs7.c ++++ b/lib/x509/pkcs7.c +@@ -1318,7 +1318,8 @@ gnutls_x509_crt_t find_signer(gnutls_pkcs7_t pkcs7, gnutls_x509_trust_list_t tl, + issuer = find_verified_issuer_of(pkcs7, issuer, purpose, vflags); + + if (issuer != NULL && gnutls_x509_crt_check_issuer(issuer, issuer)) { +- if (prev) gnutls_x509_crt_deinit(prev); ++ if (prev && prev != signer) ++ gnutls_x509_crt_deinit(prev); + prev = issuer; + break; + } +diff --git a/tests/Makefile.am b/tests/Makefile.am +index cec0a4e..b3cb56c 100644 +--- a/tests/Makefile.am ++++ b/tests/Makefile.am +@@ -230,7 +230,7 @@ ctests += mini-record-2 simple gnutls_hmac_fast set_pkcs12_cred cert certuniquei + sign-verify-newapi sign-verify-deterministic iov aead-cipher-vec \ + tls13-without-timeout-func buffer status-request-revoked \ + set_x509_ocsp_multi_cli kdf-api keylog-func handshake-write \ +- x509cert-dntypes id-on-xmppAddr tls13-compat-mode ciphersuite-name ++ x509cert-dntypes id-on-xmppAddr tls13-compat-mode ciphersuite-name pkcs7-verify-double-free + + ctests += tls-channel-binding + +diff --git a/tests/pkcs7-verify-double-free.c b/tests/pkcs7-verify-double-free.c +new file mode 100644 +index 0000000..fadf307 +--- /dev/null ++++ b/tests/pkcs7-verify-double-free.c +@@ -0,0 +1,215 @@ ++/* ++ * Copyright (C) 2022 Red Hat, Inc. ++ * ++ * Author: Zoltan Fridrich ++ * ++ * This file is part of GnuTLS. ++ * ++ * GnuTLS is free software: you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License as published by ++ * the Free Software Foundation, either version 3 of the License, or ++ * (at your option) any later version. ++ * ++ * GnuTLS is distributed in the hope that it will be useful, but ++ * WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ * General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with GnuTLS. If not, see . ++ */ ++ ++#ifdef HAVE_CONFIG_H ++#include ++#endif ++ ++#include ++#include ++#include ++ ++#include "utils.h" ++ ++static char rca_pem[] = ++ "-----BEGIN CERTIFICATE-----\n" ++ "MIIDCjCCAfKgAwIBAgIBATANBgkqhkiG9w0BAQsFADAVMRMwEQYDVQQKDApFeGFt\n" ++ "cGxlIENBMCAXDTE3MDcyMTE0NDMzNloYDzIyMjIwNzIxMTQ0MzM2WjAVMRMwEQYD\n" ++ "VQQKDApFeGFtcGxlIENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA\n" ++ "v8hnKPJ/IA0SQB/A/a0Uh+npZ67vsgIMrtTQo0r0kJkmkBz5323xO3DVuJfB3QmX\n" ++ "v9zvoeCQLuDvWar5Aixfxgm6s5Q+yPvJj9t3NebDrU+Y4+qyewBIJUF8EF/5iBPC\n" ++ "ZHONmzbfIRWvQWGGgb2CRcOHp2J7AY/QLB6LsWPaLjs/DHva28Q13JaTTHIpdu8v\n" ++ "t6vHr0nXf66DN4MvtoF3N+o+v3snJCMsfXOqASi4tbWR7gtOfCfiz9uBjh0W2Dut\n" ++ "/jclBQkJkLe6esNSM+f4YiOpctVDjmfj8yoHCp394vt0wFqhG38wsTFAyVP6qIcf\n" ++ "5zoSu9ovEt2cTkhnZHjiiwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1Ud\n" ++ "DwEB/wQEAwIBBjAdBgNVHQ4EFgQUhjeO6Uc5imbjOl2I2ltVA27Hu9YwHwYDVR0j\n" ++ "BBgwFoAUhjeO6Uc5imbjOl2I2ltVA27Hu9YwDQYJKoZIhvcNAQELBQADggEBAD+r\n" ++ "i/7FsbG0OFKGF2+JOnth6NjJQcMfM8LiglqAuBUijrv7vltoZ0Z3FJH1Vi4OeMXn\n" ++ "l7X/9tWUve0uFl75MfjDrf0+lCEdYRY1LCba2BrUgpbbkLywVUdnbsvndehegCgS\n" ++ "jss2/zys3Hlo3ZaHlTMQ/NQ4nrxcxkjOvkZSEOqgxJTLpzm6pr7YUts4k6c6lNiB\n" ++ "FSiJiDzsJCmWR9C3fBbUlfDfTJYGN3JwqX270KchXDElo8gNoDnF7jBMpLFFSEKm\n" ++ "MyfbNLX/srh+CEfZaN/OZV4A3MQ0L8vQEp6M4CJhvRLIuMVabZ2coJ0AzystrOMU\n" ++ "LirBWjg89RoAjFQ7bTE=\n" ++ "-----END CERTIFICATE-----\n"; ++ ++static char ca_pem[] = ++ "-----BEGIN CERTIFICATE-----\n" ++ "MIIDFzCCAf+gAwIBAgIBAjANBgkqhkiG9w0BAQsFADAVMRMwEQYDVQQKDApFeGFt\n" ++ "cGxlIENBMCAXDTE3MDcyMTE0NDQzNFoYDzIyMjIwNzIxMTQ0NDM0WjAiMSAwHgYD\n" ++ "VQQKDBdFeGFtcGxlIGludGVybWVkaWF0ZSBDQTCCASIwDQYJKoZIhvcNAQEBBQAD\n" ++ "ggEPADCCAQoCggEBAKb9ACB8u//sP6MfNU1OsVw68xz3eTPLgKxS0vpqexm6iGVg\n" ++ "ug/o9uYRLzqiEukv/eyz9WzHmY7sqlOJjOFdv92+SaNg79Jc51WHPFXgea4/qyfr\n" ++ "4y14PGs0SNxm6T44sXurUs7cXydQVUgnq2VCaWFOTUdxXoAWkV8r8GaUoPD/klVz\n" ++ "RqxSZVETmX1XBKhsMnnov41kRwVph2C+VfUspsbaUZaz/o/S1/nokhXRACzKsMBr\n" ++ "obqiGxbY35uVzsmbAW5ErhQz98AWJL3Bub1fsEMXg6OEMmPH4AtX888dTIYZNw0E\n" ++ "bUIESspz1kjJQTtVQDHTprhwz16YiSVeUonlLgMCAwEAAaNjMGEwDwYDVR0TAQH/\n" ++ "BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFPBjxDWjMhjXERirKF9O\n" ++ "o/5Cllc5MB8GA1UdIwQYMBaAFIY3julHOYpm4zpdiNpbVQNux7vWMA0GCSqGSIb3\n" ++ "DQEBCwUAA4IBAQCTm+vv3hBa6lL5IT+Fw8aTxQ2Ne7mZ5oyazhvXYwwfKNMX3SML\n" ++ "W2JdPaL64ZwbxxxYvW401o5Z0CEgru3YFrsqB/hEdl0Uf8UWWJmE1rRa+miTmbjt\n" ++ "lrLNCWdrs6CiwvsPITTHg7jevB4KyZYsTSxQFcyr3N3xF+6EmOTC4IkhPPnXYXcp\n" ++ "248ih+WOavSYoRvzgB/Dip1WnPYU2mfIV3O8JReRryngA0TzWCLPLUoWR3R4jwtC\n" ++ "+1uSLoqaenz3qv3F1WEbke37az9YJuXx/5D8CqFQiZ62TUUtI6fYd8mkMBM4Qfh6\n" ++ "NW9XrCkI9wlpL5K9HllhuW0BhKeJkuPpyQ2p\n" ++ "-----END CERTIFICATE-----\n"; ++ ++static char ee_pem[] = ++ "-----BEGIN CERTIFICATE-----\n" ++ "MIIDIjCCAgqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQKDBdFeGFt\n" ++ "cGxlIGludGVybWVkaWF0ZSBDQTAgFw0yMjA3MjExNDQ1MzdaGA8yMjIyMDcyMTE0\n" ++ "NDUzN1owFTETMBEGA1UEAwwKSm9obiBTbWl0aDCCASIwDQYJKoZIhvcNAQEBBQAD\n" ++ "ggEPADCCAQoCggEBAMb1uuxppBFY+WVD45iyHUq7DkIJNNOI/JRaybVJfPktWq2E\n" ++ "eNe7XhV05KKnqZTbDO2iYqNHqGhZ8pz/IstDRTZP3z/q1vXTG0P9Gx28rEy5TaUY\n" ++ "QjtD+ZoFUQm0ORMDBjd8jikqtJ87hKeuOPMH4rzdydotMaPQSm7KLzHBGBr6gg7z\n" ++ "g1IxPWkhMyHapoMqqrhjwjzoTY97UIXpZTEoIA+KpEC8f9CciBtL0i1MPBjWozB6\n" ++ "Jma9q5iEwZXuRr3cnPYeIPlK2drgDZCMuSFcYiT8ApLw5OhKqY1m2EvfZ2ox2s9R\n" ++ "68/HzYdPi3kZwiNEtlBvMlpt5yKBJAflp76d7DkCAwEAAaNuMGwwCwYDVR0PBAQD\n" ++ "AgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDBDAdBgNVHQ4EFgQUc+Mi\n" ++ "kr8WMCk00SQo+P2iggp/oQkwHwYDVR0jBBgwFoAU8GPENaMyGNcRGKsoX06j/kKW\n" ++ "VzkwDQYJKoZIhvcNAQELBQADggEBAKU9+CUR0Jcfybd1+8Aqgh1RH96yQygnVuyt\n" ++ "Na9rFz4fM3ij9tGXDHXrkZw8bW1dWLU9quu8zeTxKxc3aiDIw739Alz0tukttDo7\n" ++ "dW7YqIb77zsIsWB9p7G9dlxT6ieUy+5IKk69BbeK8KR0vAciAG4KVQxPhuPy/LGX\n" ++ "PzqlJIJ4h61s3UOroReHPB1keLZgpORqrvtpClOmABH9TLFRJA/WFg8Q2XYB/p0x\n" ++ "l/pWiaoBC+8wK9cDoMUK5yOwXeuCLffCb+UlAD0+z/qxJ2pisE8E9X8rRKRrWI+i\n" ++ "G7LtJCEn86EQK8KuRlJxKgj8lClZhoULB0oL4jbblBuNow9WRmM=\n" ++ "-----END CERTIFICATE-----\n"; ++ ++static char msg_pem[] = ++ "-----BEGIN PKCS7-----\n" ++ "MIIK2QYJKoZIhvcNAQcCoIIKyjCCCsYCAQExDTALBglghkgBZQMEAgEwCwYJKoZI\n" ++ "hvcNAQcBoIIJTzCCAwowggHyoAMCAQICAQEwDQYJKoZIhvcNAQELBQAwFTETMBEG\n" ++ "A1UECgwKRXhhbXBsZSBDQTAgFw0xNzA3MjExNDQzMjFaGA8yMjIyMDcyMTE0NDMy\n" ++ "MVowFTETMBEGA1UECgwKRXhhbXBsZSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEP\n" ++ "ADCCAQoCggEBAL51eyE4j8wAKQKMGlO9HEY2iaGvsdPSJmidSdmCi1jnNK39Lx4Y\n" ++ "31h279hSHF5wtI6VM91HHfeLf1mjEZHlKrXXJQzBPLpbHWapD778drHBitOP8e56\n" ++ "fDMIfofLV4tkMk8690vPe4cJH1UHGspMyz6EQF9kPRaW80XtMV/6dalgL/9Esmaw\n" ++ "XBNPJAS1VutDuXQkJ/3/rWFLmkpYHHtGPjX782YRmT1s+VOVTsLqmKx0TEL8A381\n" ++ "bbElHPUAMjPcyWR5qqA8KWnS5Dwqk3LwI0AvuhQytCq0S7Xl4DXauvxwTRXv0UU7\n" ++ "W8r3MLAw9DnlnJiD/RFjw5rbGO3wMePk/qUCAwEAAaNjMGEwDwYDVR0TAQH/BAUw\n" ++ "AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFIh2KRoKJoe2VtpOwWMkRAkR\n" ++ "mLWKMB8GA1UdIwQYMBaAFIh2KRoKJoe2VtpOwWMkRAkRmLWKMA0GCSqGSIb3DQEB\n" ++ "CwUAA4IBAQBovvlOjoy0MCT5U0eWfcPQQjY4Ssrn3IiPNlVkqSNo+FHX+2baTLVQ\n" ++ "5QTHxwXwzdIJiwtjFWDdGEQXqmuIvnFG+u/whGbeg6oQygfnQ5Y+q6epOxCsPgLQ\n" ++ "mKKEaF7mvh8DauUx4QSbYCNGCctOZuB1vlN9bJ3/5QbH+2pFPOfCr5CAyPDwHo6S\n" ++ "qO3yPcutRwT9xS7gXEHM9HhLp+DmdCGh4eVBPiFilyZm1d92lWxU8oxoSfXgzDT/\n" ++ "GCzlMykNZNs4JD9QmiRClP/3U0dQbOhah/Fda+N+L90xaqEgGcvwKKZa3pzo59pl\n" ++ "BbkcIP4YPyHeinwkgAn5UVJg9DOxNCS0MIIDFzCCAf+gAwIBAgIBAjANBgkqhkiG\n" ++ "9w0BAQsFADAVMRMwEQYDVQQKDApFeGFtcGxlIENBMCAXDTE3MDcyMTE0NDQxM1oY\n" ++ "DzIyMjIwNzIxMTQ0NDEzWjAiMSAwHgYDVQQKDBdFeGFtcGxlIGludGVybWVkaWF0\n" ++ "ZSBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMPFDEvDANwvhviu\n" ++ "pwXTvaKyxyX94jVu1wgAhIRyQBVRiMbrn8MEufLG8oA0vKd8s92gv/lWe1jFb2rn\n" ++ "91jMkZWsjWjiJFD6SzqFfBo+XxOGikEqO1MAf92UqavmSGlXVRG1Vy7T7dWibZP0\n" ++ "WODhHYWayR0Y6owSz5IqNfrHXzDME+lSJxHgRFI7pK+b0OgiVmvyXDKFPvyU6GrP\n" ++ "lxXDi/XbjyPvC5gpiwtTgm+s8KERwmdlfZUNjkh2PpHx1g1joijHT3wIvO/Pek1E\n" ++ "C+Xs6w3XxGgL6TTL7FDuv4AjZVX9KK66/yBhX3aN8bkqAg+hs9XNk3zzWC0XEFOS\n" ++ "Qoh2va0CAwEAAaNjMGEwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYw\n" ++ "HQYDVR0OBBYEFHwi/7dUWGjkMWJctOm7MCjjQj1cMB8GA1UdIwQYMBaAFIh2KRoK\n" ++ "Joe2VtpOwWMkRAkRmLWKMA0GCSqGSIb3DQEBCwUAA4IBAQCF6sHCBdYRwBwvfCve\n" ++ "og9cPnmPqZrG4AtmSvtoSsMvgvKb/4z3/gG8oPtTBkeRcAHoMoEp/oA+B2ylwIAc\n" ++ "S5U7jx+lYH/Pqih0X/OcOLbaMv8uzGSGQxk+L9LuuIT6E/THfRRIPEvkDkzC+/uk\n" ++ "7vUbG17bSEWeF0o/6sjzAY2aH1jnbCDyu0UC78GXkc6bZ5QlH98uLMDMrOmqcZjS\n" ++ "JFfvuRDQyKV5yBdBkYaobsIWSQDsgYxJzf/2y8c3r+HXqT+jhrXPWJ3btgMPxpu7\n" ++ "E8KmoFgp9EM+48oYlXJ66rk08/KjaVmgN7R+Hm3e2+MFT2kme4fBKalLjcazTe3x\n" ++ "0FisMIIDIjCCAgqgAwIBAgIBATANBgkqhkiG9w0BAQsFADAiMSAwHgYDVQQKDBdF\n" ++ "eGFtcGxlIGludGVybWVkaWF0ZSBDQTAgFw0yMjA3MjExNDQ1MzBaGA8yMjIyMDcy\n" ++ "MTE0NDUzMVowFTETMBEGA1UEAwwKSm9obiBTbWl0aDCCASIwDQYJKoZIhvcNAQEB\n" ++ "BQADggEPADCCAQoCggEBAMjhSqhdD5RjmOm6W3hG7zkgKBP9whRN/SipcdEMlkgc\n" ++ "F/U3QMu66qIfKwheNdWalC1JLtruLDWP92ysa6Vw+CCG8aSax1AgB//RKQB7kgPA\n" ++ "9js9hi/oCdBmCv2HJxhWSLz+MVoxgzW4C7S9FenI+btxe/99Uw4nOw7kwjsYDLKr\n" ++ "tMw8myv7aCW/63CuBYGtohiZupM3RI3kKFcZots+KRPLlZpjv+I2h9xSln8VxKNb\n" ++ "XiMrYwGfHB7iX7ghe1TvFjKatEUhsqa7AvIq7nfe/cyq97f0ODQO814njgZtk5iQ\n" ++ "JVavXHdhTVaypt1HdAFMuHX5UATylHxx9tRCgSIijUsCAwEAAaNuMGwwCwYDVR0P\n" ++ "BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDBDAdBgNVHQ4EFgQU\n" ++ "31+vHl4E/2Jpnwinbzf+d7usshcwHwYDVR0jBBgwFoAUfCL/t1RYaOQxYly06bsw\n" ++ "KONCPVwwDQYJKoZIhvcNAQELBQADggEBAAWe63DcNwmleQ3INFGDJZ/m2I/R/cBa\n" ++ "nnrxgR5Ey1ljHdA/x1z1JLTGmGVwqGExs5DNG9Q//Pmc9pZ1yPa8J4Xf8AvFcmkY\n" ++ "mWoH1HvW0xu/RF1UN5SAoD2PRQ+Vq4OSPD58IlEu/u4o1wZV7Wl91Cv6VNpiAb63\n" ++ "j9PA1YacOpOtcRqG59Vuj9HFm9f30ejHVo2+KJcpo290cR3Zg4fOm8mtjeMdt/QS\n" ++ "Atq+RqPAQ7yxqvEEv8zPIZj2kAOQm3mh/yYqBrR68lQUD/dBTP7ApIZkhUK3XK6U\n" ++ "nf9JvoF6Fn2+Cnqb//FLBgHSnoeqeQNwDLUXTsD02iYxHzJrhokSY4YxggFQMIIB\n" ++ "TAIBATAnMCIxIDAeBgNVBAoMF0V4YW1wbGUgaW50ZXJtZWRpYXRlIENBAgEBMAsG\n" ++ "CWCGSAFlAwQCATANBgkqhkiG9w0BAQEFAASCAQATHg6wNsBcs/Ub1GQfKwTpKCk5\n" ++ "8QXuNnZ0u7b6mKgrSY2Gf47fpL2aRgaR+BAQncbctu5EH/IL38pWjaGtOhFAj/5q\n" ++ "7luVQW11kuyJN3Bd/dtLqawWOwMmAIEigw6X50l5ZHnEVzFfxt+RKTNhk4XWVtbi\n" ++ "2iIlITOplW0rnvxYAwCxKL9ocaB7etK8au7ixMxbFp75Ts4iLX8dhlAFdCuFCk8k\n" ++ "B8mi9HHuwr3QYRqMPW61hu1wBL3yB8eoZNOwPXb0gkIh6ZvgptxgQzm/cc+Iw9fP\n" ++ "QkR0fTM7ElJ5QZmSV98AUbZDHmDvpmcjcUxfSPMc3IoT8T300usRu7QHqKJi\n" ++ "-----END PKCS7-----\n"; ++ ++const gnutls_datum_t rca_datum = { (void *)rca_pem, sizeof(rca_pem) - 1 }; ++const gnutls_datum_t ca_datum = { (void *)ca_pem, sizeof(ca_pem) - 1 }; ++const gnutls_datum_t ee_datum = { (void *)ee_pem, sizeof(ee_pem) - 1 }; ++const gnutls_datum_t msg_datum = { (void *)msg_pem, sizeof(msg_pem) - 1 }; ++ ++static void tls_log_func(int level, const char *str) ++{ ++ fprintf(stderr, "%s |<%d>| %s", "err", level, str); ++} ++ ++#define CHECK(X)\ ++{\ ++ r = X;\ ++ if (r < 0)\ ++ fail("error in %d: %s\n", __LINE__, gnutls_strerror(r));\ ++}\ ++ ++void doit(void) ++{ ++ int r; ++ gnutls_x509_crt_t rca_cert = NULL; ++ gnutls_x509_crt_t ca_cert = NULL; ++ gnutls_x509_crt_t ee_cert = NULL; ++ gnutls_x509_trust_list_t tlist = NULL; ++ gnutls_pkcs7_t pkcs7 = NULL; ++ gnutls_datum_t data = { (unsigned char *)"xxx", 3 }; ++ ++ if (debug) { ++ gnutls_global_set_log_function(tls_log_func); ++ gnutls_global_set_log_level(4711); ++ } ++ ++ // Import certificates ++ CHECK(gnutls_x509_crt_init(&rca_cert)); ++ CHECK(gnutls_x509_crt_import(rca_cert, &rca_datum, GNUTLS_X509_FMT_PEM)); ++ CHECK(gnutls_x509_crt_init(&ca_cert)); ++ CHECK(gnutls_x509_crt_import(ca_cert, &ca_datum, GNUTLS_X509_FMT_PEM)); ++ CHECK(gnutls_x509_crt_init(&ee_cert)); ++ CHECK(gnutls_x509_crt_import(ee_cert, &ee_datum, GNUTLS_X509_FMT_PEM)); ++ ++ // Setup trust store ++ CHECK(gnutls_x509_trust_list_init(&tlist, 0)); ++ CHECK(gnutls_x509_trust_list_add_named_crt(tlist, rca_cert, "rca", 3, 0)); ++ CHECK(gnutls_x509_trust_list_add_named_crt(tlist, ca_cert, "ca", 2, 0)); ++ CHECK(gnutls_x509_trust_list_add_named_crt(tlist, ee_cert, "ee", 2, 0)); ++ ++ // Setup pkcs7 structure ++ CHECK(gnutls_pkcs7_init(&pkcs7)); ++ CHECK(gnutls_pkcs7_import(pkcs7, &msg_datum, GNUTLS_X509_FMT_PEM)); ++ ++ // Signature verification ++ gnutls_pkcs7_verify(pkcs7, tlist, NULL, 0, 0, &data, 0); ++ ++ gnutls_x509_crt_deinit(rca_cert); ++ gnutls_x509_crt_deinit(ca_cert); ++ gnutls_x509_crt_deinit(ee_cert); ++ gnutls_x509_trust_list_deinit(tlist, 0); ++ gnutls_pkcs7_deinit(pkcs7); ++} +-- +2.25.1 + diff --git a/meta/recipes-support/gnutls/gnutls_3.7.4.bb b/meta/recipes-support/gnutls/gnutls_3.7.4.bb index b34eb7f5f0..94e7f0d58e 100644 --- a/meta/recipes-support/gnutls/gnutls_3.7.4.bb +++ b/meta/recipes-support/gnutls/gnutls_3.7.4.bb @@ -21,6 +21,7 @@ SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "https://www.gnupg.org/ftp/gcrypt/gnutls/v${SHRT_VER}/gnutls-${PV}.tar.xz \ file://arm_eabi.patch \ + file://CVE-2022-2509.patch \ " SRC_URI[sha256sum] = "e6adbebcfbc95867de01060d93c789938cf89cc1d1f6ef9ef661890f6217451f" From patchwork Fri Aug 19 02:42:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11577 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 872DCC25B0E for ; Fri, 19 Aug 2022 02:43:35 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web09.51220.1660877007440812671 for ; Thu, 18 Aug 2022 19:43:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=J05lLoTb; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id pm17so3390842pjb.3 for ; Thu, 18 Aug 2022 19:43:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=SbKxaCmzF61CntcucynZRbUpqV+xy5/f78+ObsZVN1c=; b=J05lLoTbmDx+Hr/Oo98s6Fbg/ZaMeBoQNRdaSUjtx1dcx+4jJhcL9VV64LCqXmVW8b Y7wLFEMaucra+eH5r7NV8O4NE0pUGPB2ENa9QPCsecQca9VSoamzkpM/7IGh6m6A9Abh 9pgbWcqm3lzmNqH0tlIUR7N3t+o6Pb2ztvT/e57QsN7+AVcKX3LaTYYmzAImCEWv2TPs Rs09IOfMaVUd1gW+5R0/3tOuQARfJ/ZCP+jrPW1cBnBEo8KJYoOoPk8s5KDXWUOF43Be 4yhYVDVBPO+kfPHGKJ/+vKhdmNOvuhXunKg1xvrzSR+oWwwwfIaByUBhF64TRfozMMvm V1NQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=SbKxaCmzF61CntcucynZRbUpqV+xy5/f78+ObsZVN1c=; b=cnjkoah/XxPO7npJk3GM8DKwClK3fho0OLj+THdzyynLXRe4qn1w/rgCqhhJInSDyx 394DPXNiCdd+1oYWSMqFwpvfHl1WeiE4Xra2cQ2RLd06Q18lYBt91ir643O7KEi57yFX wDEl5/qWk0Mc3Jv6FiNzi1SeT602Bz8MeGHwiobLVqcxHQAcLJlZKWtTCxKeEBmh1XTU Pepw/upgDaDpAB+/GtZHFxCkB/9wbOrorC9+pCtE3H6+c2aeXtnRqkd673Rz6qD0m/c/ D1MHrc8WixJlmTiDHqC3XclvcwHDwg1mJE+OB5Jc3mZA61TqG1VxlFo8da7u86QP/rwp vAeg== X-Gm-Message-State: ACgBeo3rDhXRtboRX2Lp4FyyRHJt6NTY9fyHTDR1s4Vn/Ui+GtDTa2pG KNd/WHZlMqtNqym6iXUeCz93RqP29GpXI4v6 X-Google-Smtp-Source: AA6agR6iPoW6xPTqSDzqPsF5oWZiy+Na1cvExP6DkHVctIWhX5ucLP5/ttSuuIP9R1Dfrh4GE1GGuQ== X-Received: by 2002:a17:90b:4a50:b0:1f3:2a20:5a80 with SMTP id lb16-20020a17090b4a5000b001f32a205a80mr5936670pjb.96.1660877006413; Thu, 18 Aug 2022 19:43:26 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:25 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/26] zlib: CVE-2022-37434 a heap-based buffer over-read Date: Thu, 18 Aug 2022 16:42:31 -1000 Message-Id: <46ac4a9dc832edb1b3e75bb4003930085b086bef.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169552 From: Hitendra Prajapati Source: https://github.com/madler/zlib MR: 120525 Type: Security Fix Disposition: Backport from https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166bece1 & https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d ChangeID: 94d9b7d372b83cc1022c0a15046c5449d39208c3 Description: CVE-2022-37434 zlib: a heap-based buffer over-read or buffer overflow in inflate in inflate.c via a large gzip header extra field. Signed-off-by: Hitendra Prajapati Signed-off-by: Steve Sakoman --- .../zlib/zlib/CVE-2022-37434.patch | 44 +++++++++++++++++++ meta/recipes-core/zlib/zlib_1.2.11.bb | 1 + 2 files changed, 45 insertions(+) create mode 100644 meta/recipes-core/zlib/zlib/CVE-2022-37434.patch diff --git a/meta/recipes-core/zlib/zlib/CVE-2022-37434.patch b/meta/recipes-core/zlib/zlib/CVE-2022-37434.patch new file mode 100644 index 0000000000..d29e6e0f1f --- /dev/null +++ b/meta/recipes-core/zlib/zlib/CVE-2022-37434.patch @@ -0,0 +1,44 @@ +From 8617d83d6939754ae3a04fc2d22daa18eeea2a43 Mon Sep 17 00:00:00 2001 +From: Hitendra Prajapati +Date: Wed, 17 Aug 2022 10:15:57 +0530 +Subject: [PATCH] CVE-2022-37434 + +Upstream-Status: Backport [https://github.com/madler/zlib/commit/eff308af425b67093bab25f80f1ae950166bece1 & https://github.com/madler/zlib/commit/1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d] +CVE: CVE-2022-37434 +Signed-off-by: Hitendra Prajapati + +Fix a bug when getting a gzip header extra field with inflate(). + +If the extra field was larger than the space the user provided with +inflateGetHeader(), and if multiple calls of inflate() delivered +the extra header data, then there could be a buffer overflow of the +provided space. This commit assures that provided space is not +exceeded. + + Fix extra field processing bug that dereferences NULL state->head. + +The recent commit to fix a gzip header extra field processing bug +introduced the new bug fixed here. +--- + inflate.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/inflate.c b/inflate.c +index ac333e8..cd01857 100644 +--- a/inflate.c ++++ b/inflate.c +@@ -759,8 +759,9 @@ int flush; + if (copy > have) copy = have; + if (copy) { + if (state->head != Z_NULL && +- state->head->extra != Z_NULL) { +- len = state->head->extra_len - state->length; ++ state->head->extra != Z_NULL && ++ (len = state->head->extra_len - state->length) < ++ state->head->extra_max) { + zmemcpy(state->head->extra + len, next, + len + copy > state->head->extra_max ? + state->head->extra_max - len : copy); +-- +2.25.1 + diff --git a/meta/recipes-core/zlib/zlib_1.2.11.bb b/meta/recipes-core/zlib/zlib_1.2.11.bb index f8bcc0abcf..f768b41988 100644 --- a/meta/recipes-core/zlib/zlib_1.2.11.bb +++ b/meta/recipes-core/zlib/zlib_1.2.11.bb @@ -11,6 +11,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/${BPN}/${PV}/${BPN}-${PV}.tar.xz \ file://0001-configure-Pass-LDFLAGS-to-link-tests.patch \ file://CVE-2018-25032.patch \ file://run-ptest \ + file://CVE-2022-37434.patch \ " UPSTREAM_CHECK_URI = "http://zlib.net/" From patchwork Fri Aug 19 02:42:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11579 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 89208C32789 for ; Fri, 19 Aug 2022 02:43:35 +0000 (UTC) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by mx.groups.io with SMTP id smtpd.web08.50679.1660877009442128014 for ; Thu, 18 Aug 2022 19:43:29 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=7fPgvtjP; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d16so3021485pll.11 for ; Thu, 18 Aug 2022 19:43:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=2qm7AFK5vIecKpaFRee+r5o5dDMXtbsBagZkoZjDn8U=; b=7fPgvtjPKWXaWpAhdQeJag4py9dCoOfKvpcgXKaPww5fW8SLGvB+u9yIzo8ru8mT0s S2FaKdWqUv4uVhds52Sk0Lm16+oukcU62EV+Z+74Ddikrjdu929kiK7f5cDjcpgeVIEZ OjnsyNQZM/g+VcdHK2mNq2piXjQoQc50PZvpnayGPSKVhmyR9Luij86hQ4p8VLYkk5yV 9JLy4I73yiUcMmL99Ejc/rLT0c5+vY/catQqq5PfaVOLI4mVQCyV7qbQV44m/p+0QRl9 2ZI8vlNNNvZXJB7FzAMVAwnyLSHvKUtccZkxElvXn/abrtnnQvnYDubmseilaFn6oLID lg0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=2qm7AFK5vIecKpaFRee+r5o5dDMXtbsBagZkoZjDn8U=; b=bSDPAEpkQ5O93/w3rnR/oEG4r+WF2iOVcK+3gqgLHtE88DOvwfgyKh0XvAd6L54yZn 32gPkifrcu4fSik3Dh2mxRbXOMFljbhLOk71VhoZHO/xnGQKon9E6iBavD1Yx2QLXzti GeFR+dJm2mUWgMdUSI2O9Vnng4taO0viFNTfSsefGSs1odZmfDbL2tG3DbDP/+R7dU0f LDGtNnenbTReesYKfp9qGsYOsAKbrUSX71ps+dKrOsFgJpMaLTUAgiYxpqLU7Gj96hpT +3H8oq/WjQtP3amiCuqpMAWlXAa5WbzBVVM38Xkj4GSWZNqsK8noWCrGpvAUM3DbOwsN iTiw== X-Gm-Message-State: ACgBeo3/v/x28Z1K17xXRnCzJnVAIKS3TDXA25d0fwMxyucRemJc5DaP FV4iqhI1Y5649AHadj0C2PAV3p/JBLRX8ohy X-Google-Smtp-Source: AA6agR5YAJN2fatoyXOJTYGC6hd4wNpwYe33hauEuA+FwBClExceHS28tCViLLuTMpB1rIpIBAXrCg== X-Received: by 2002:a17:90a:1d0:b0:1fa:c551:5e83 with SMTP id 16-20020a17090a01d000b001fac5515e83mr7089497pjd.106.1660877008475; Thu, 18 Aug 2022 19:43:28 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:27 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/26] vim: update from 9.0.0063 to 9.0.0115 Date: Thu, 18 Aug 2022 16:42:32 -1000 Message-Id: <27e4c6f98be296fb5f67ac7775461854d48f6c9a.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169553 From: Randy MacLeod Drop crosscompile.patch which was merged as part of: 509695c1c (tag: v9.0.0065) patch 9.0.0065: \ cross-compiling doesn't work because of timer_create check Also drop: racefix.patch which may have been fixed upstream and is being tracked by: https://github.com/vim/vim/pull/10776 where upstream is asking if the different approach resolves the race condition. Let's see what's out there! Signed-off-by: Randy MacLeod Signed-off-by: Luca Ceresoli (cherry picked from commit 6996472cd33d2d4b91821f2dfe24a27a697e4afe) Signed-off-by: Steve Sakoman --- .../vim/files/crosscompile.patch | 51 ------------------- meta/recipes-support/vim/files/racefix.patch | 37 -------------- meta/recipes-support/vim/vim.inc | 6 +-- 3 files changed, 2 insertions(+), 92 deletions(-) delete mode 100644 meta/recipes-support/vim/files/crosscompile.patch delete mode 100644 meta/recipes-support/vim/files/racefix.patch diff --git a/meta/recipes-support/vim/files/crosscompile.patch b/meta/recipes-support/vim/files/crosscompile.patch deleted file mode 100644 index 583d3fc7b0..0000000000 --- a/meta/recipes-support/vim/files/crosscompile.patch +++ /dev/null @@ -1,51 +0,0 @@ -configure.ac: Fix create_timer solaris test for cross compiling - -A runtime test was added for create_timer however this meant cross compiling -would no longer work. Allow a cache value to be specified to allow cross -compiling again. - -Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org - -Upstream-Status: Submitted [https://github.com/vim/vim/pull/10777] - -Index: git/src/configure.ac -=================================================================== ---- git.orig/src/configure.ac -+++ git/src/configure.ac -@@ -3814,7 +3814,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM( - dnl Check for timer_create. It probably requires the 'rt' library. - dnl Run the program to find out if timer_create(CLOCK_MONOTONIC) actually - dnl works, on Solaris timer_create() exists but fails at runtime. --AC_MSG_CHECKING([for timer_create]) -+AC_CACHE_CHECK([for timer_create], [vim_cv_timer_create], - save_LIBS="$LIBS" - LIBS="$LIBS -lrt" - AC_RUN_IFELSE([AC_LANG_PROGRAM([ -@@ -3831,7 +3831,7 @@ static void set_flag(union sigval sv) {} - if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0) - exit(1); // cannot create a monotonic timer - ])], -- AC_MSG_RESULT(yes; with -lrt); AC_DEFINE(HAVE_TIMER_CREATE), -+ AC_MSG_NOTICE(timer_create with -lrt); vim_cv_timer_create=yes, - LIBS="$save_LIBS" - AC_RUN_IFELSE([AC_LANG_PROGRAM([ - #include -@@ -3847,8 +3847,16 @@ static void set_flag(union sigval sv) {} - if (timer_create(CLOCK_MONOTONIC, &action, &timer_id) < 0) - exit(1); // cannot create a monotonic timer - ])], -- AC_MSG_RESULT(yes); AC_DEFINE(HAVE_TIMER_CREATE), -- AC_MSG_RESULT(no))) -+ vim_cv_timer_create=yes, -+ vim_cv_timer_create=no), -+ AC_MSG_ERROR(cross-compiling: please set 'vim_cv_timer_create') -+ ) -+) -+ -+if test "x$vim_cv_timer_create" = "xyes" ; then -+ AC_DEFINE(HAVE_TIMER_CREATE) -+fi -+ - - AC_CACHE_CHECK([whether stat() ignores a trailing slash], [vim_cv_stat_ignores_slash], - [ diff --git a/meta/recipes-support/vim/files/racefix.patch b/meta/recipes-support/vim/files/racefix.patch deleted file mode 100644 index 34bd37d650..0000000000 --- a/meta/recipes-support/vim/files/racefix.patch +++ /dev/null @@ -1,37 +0,0 @@ -po/Makefile: Avoid race over LINGUAS file - -The creation of the LINGUAS file is duplicated for each desktop file -which can lead the commands to race against each other. One target might -remove it before another has been able to use it. Rework the makefile to -avoid this as the expense of leaving the file on disk. - -Signed-off-by: Richard Purdie richard.purdie@linuxfoundation.org - -Upstream-Status: Submitted [https://github.com/vim/vim/pull/10776] - -Index: git/src/po/Makefile -=================================================================== ---- git.orig/src/po/Makefile -+++ git/src/po/Makefile -@@ -207,17 +207,16 @@ $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM - # Delete the temporary files - rm *.js - --vim.desktop: vim.desktop.in $(POFILES) -+LINGUAS: - echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS -+ -+vim.desktop: vim.desktop.in $(POFILES) LINGUAS - $(MSGFMT) --desktop -d . --template vim.desktop.in -o tmp_vim.desktop -- rm -f LINGUAS - if command -v desktop-file-validate; then desktop-file-validate tmp_vim.desktop; fi - mv tmp_vim.desktop vim.desktop - --gvim.desktop: gvim.desktop.in $(POFILES) -- echo $(LANGUAGES) | tr " " "\n" |sed -e '/\./d' | sort > LINGUAS -+gvim.desktop: gvim.desktop.in $(POFILES) LINGUAS - $(MSGFMT) --desktop -d . --template gvim.desktop.in -o tmp_gvim.desktop -- rm -f LINGUAS - if command -v desktop-file-validate; then desktop-file-validate tmp_gvim.desktop; fi - mv tmp_gvim.desktop gvim.desktop - diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 31229534e4..48896465ed 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -18,12 +18,10 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://vim-add-knob-whether-elf.h-are-checked.patch \ file://0001-src-Makefile-improve-reproducibility.patch \ file://no-path-adjust.patch \ - file://racefix.patch \ - file://crosscompile.patch \ " -PV .= ".0063" -SRCREV = "d61efa50f8f5b9d9dcbc136705cc33874f0fdcb3" +PV .= ".0115" +SRCREV = "6747cf1671bd41cddee77c65b3f9a70509f968db" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Fri Aug 19 02:42:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11575 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 75502C00140 for ; Fri, 19 Aug 2022 02:43:35 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web12.50629.1660877011766583774 for ; Thu, 18 Aug 2022 19:43:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=u2/J0flT; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id m2so3042739pls.4 for ; Thu, 18 Aug 2022 19:43:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=s/T3RS6Sh7B48nOCcQ023Bz9GN/Zh5uJbdIRe0J2cx4=; b=u2/J0flTInn2RpbI9Z9eqwGGB+ywvHpJXE7Sn6fjMfdZc9t38T2Ok9sesKAn+ue/Ov TF2AMHWzu1WbavgjlILfeEOjWDACJ4v0vFZs4xtOhamMusKS1LDUaikBtme/peHBFQ0M ZVd0ZnNEqRy/SlxVGjQrZF/HNFLnMjzRJQd0F46CWVMqvIQXmTIQUR9scR3URdT5Rgid /C+nAc6gh49rcQRR5tD4tyI0KdWz1zw69WJaMU7z+mL6mSQ0fIvJOdaucBfbU9C+O0wp SrKGCrjvZ/KDkS3H/gADwG+ipel1anyjZm34pkI6cspHLd+S1cYte6sIrhns5TB4m1JP CK3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=s/T3RS6Sh7B48nOCcQ023Bz9GN/Zh5uJbdIRe0J2cx4=; b=G4YSxlEuu7E9qtlYsD4/PO6OUIXjKcNa+4svQ3Eik01OhYFZUZCrLz0gC6jkoB36Yn dKXe7ohI0ny6IriqIuJ0M3bBxr7DgCeZdVGLhL9AozXP89UTOypneoQ+2kta/az/F7qN dd5vRJNXsEy1Wv65Wu0a9qggqWpr/xjYvboAvEvO8wBxI6sa9qnE7DIkra6wUin67KjO 4WZR3oxiDZf4B9sSLqeFGCK1dZXfhcdErlEBRM9Mg1h1SiomeF4N/r+P9br5cxkPGcUq zj4ZlW3BHvVk7/8KUiQl1uKxIHeF6Sl9tBJU0Deq6V3SPoT8MdmrtOf1StIvrk4V57Gp 56hw== X-Gm-Message-State: ACgBeo04yfdDBoliUzTonu68Ye0TWLXRzo5ranO2AmXW5plKxeU/nfOe X8RzlIQK8AC2tXeKAx4YU7dKTHJKvzDWLtDC X-Google-Smtp-Source: AA6agR4OkftkeiViamnCWagGZtZZRZNxvWRAxAIRyTTCVv1AgaNyXI0GvTZp6WYuptzuKw4iKHnYXw== X-Received: by 2002:a17:90b:1b45:b0:1f5:753d:82bc with SMTP id nv5-20020a17090b1b4500b001f5753d82bcmr11643742pjb.68.1660877010800; Thu, 18 Aug 2022 19:43:30 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/26] devtool: error out when workspace is using old override syntax Date: Thu, 18 Aug 2022 16:42:33 -1000 Message-Id: <3aee3425956020166d99ec085e35e21b3daf625f.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169554 From: Roland Hieber When the workspace bbappends are still using the old override syntax with EXTERNALSRC_pn-*, externalsrc_re will not match, and pn will never be assigned, leading to a nondescript UnboundLocalError being raised on the user's terminal. Try to detect that situation and give the user a hint how to solve it. Signed-off-by: Roland Hieber Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit d42ea8e849cf2df3708406418b961168268b316a) Signed-off-by: Steve Sakoman --- scripts/devtool | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scripts/devtool b/scripts/devtool index af4811b922..20d785c7f7 100755 --- a/scripts/devtool +++ b/scripts/devtool @@ -104,6 +104,7 @@ def read_workspace(): for fn in glob.glob(os.path.join(config.workspace_path, 'appends', '*.bbappend')): with open(fn, 'r') as f: pnvalues = {} + pn = None for line in f: res = externalsrc_re.match(line.rstrip()) if res: @@ -123,6 +124,9 @@ def read_workspace(): elif line.startswith('# srctreebase: '): pnvalues['srctreebase'] = line.split(':', 1)[1].strip() if pnvalues: + if not pn: + raise DevtoolError("Found *.bbappend in %s, but could not determine EXTERNALSRC:pn-*. " + "Maybe still using old syntax?" % config.workspace_path) if not pnvalues.get('srctreebase', None): pnvalues['srctreebase'] = pnvalues['srctree'] logger.debug('Found recipe %s' % pnvalues) @@ -314,10 +318,10 @@ def main(): args = parser.parse_args(unparsed_args, namespace=global_args) - if not getattr(args, 'no_workspace', False): - read_workspace() - try: + if not getattr(args, 'no_workspace', False): + read_workspace() + ret = args.func(args, config, basepath, workspace) except DevtoolError as err: if str(err): From patchwork Fri Aug 19 02:42:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11578 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 761B9C3F6B0 for ; Fri, 19 Aug 2022 02:43:35 +0000 (UTC) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by mx.groups.io with SMTP id smtpd.web08.50675.1660876985505791286 for ; Thu, 18 Aug 2022 19:43:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Dx10mETZ; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id w14so3024619plp.9 for ; Thu, 18 Aug 2022 19:43:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=uMW2M/2geN49NJjvEnLIB10wRRAIgt6Nto3AOeItF/k=; b=Dx10mETZAH1FozkexcjiF5FI1hAizanXPB314KqWftsuGOR9Mg3VoVeA0eC1c0bHfa WZO7Hca43yXtWseiVlbjvP8IL/THk34AncENMBa3sek4Y6UVMo5r0hdY2t3H5087czRT 3CprxLE+ntuLvTJU9A9kpwvBoeqTBInpVQGdyjefPnRLmvpl28tYwHLwxSV4MsTAh/yS oeEKn3PYDxsiBOZbdfOEoMr3trg+918NDgcBHftzyGRE1Td38GlthMl4Erjh1DLKTqnP OfHZar5AAhO3cip1N7Munbg6YD2rZ+gbuJR/IO4S3UX01M8RQFN/N8G1mqKc2GzpSu7o m45w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=uMW2M/2geN49NJjvEnLIB10wRRAIgt6Nto3AOeItF/k=; b=J454cVdEgXibLkpi3wMM6D0E1+U+yndG2WzR6mjIbzH3+V2IMLYN3sorML+uk2hshJ Cjj/23FuGdbX1oJfNgyRJWiS//g/vExoH1D6VvBKLgZfJqYTuCk+M2eySAoM2/9wA72d gy0kpSLl0HeICimK83njhYLsOhYJ3C+WkZ8M8FWBAJ1qTPkHaiMb0uHvrQfS/iM79I/W gFLKpjWdMQuHQsEGQZ0sWZcX4oVwcROgUiWanMK0pJBxr7U9tifMTYjlLbFF3tElp4UJ Ku+68hPuMqPAWPBxtIYvGUx+p/fRCLfuBLTytOLhqLQgmWF6dl7kC5L3LYRPJTHs6n2R LOMQ== X-Gm-Message-State: ACgBeo181+0d/dUVCYMfMMLtH/e5qXODWxFsK7j1FsGxnCiogYti+928 mYKPHg+b8esJ3oNZLk1AzmNb8nGv2N/F2Jwe X-Google-Smtp-Source: AA6agR556CBkqGV7uPrhQQ+pXt23dbneVxmX1czLdYaFFFfPuXhCr9TqSAebdKGFCipTvtsXRz5QLQ== X-Received: by 2002:a17:90b:238b:b0:1fa:d833:30dd with SMTP id mr11-20020a17090b238b00b001fad83330ddmr3596614pjb.147.1660877012950; Thu, 18 Aug 2022 19:43:32 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/26] devtool/upgrade: correctly clean up when recipe filename isn't yet known Date: Thu, 18 Aug 2022 16:42:34 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:35 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169555 From: Alexander Kanavin There is a coding error in the second invocation of _upgrade_error: rf is passed into it before it is initialized in the try: block. And so bogus recipes are left behind in the workspace, causing breakage. Instead, rewrite the functions to take the recipe directory name in the workspace layer, which can be calculated in advance. Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli (cherry picked from commit e653996369c1d2b5ac8367ad85f4816d679b6c98) Signed-off-by: Steve Sakoman --- scripts/lib/devtool/upgrade.py | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 0357ec07bf..c57015eb40 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -119,20 +119,19 @@ def _write_append(rc, srctree, same_dir, no_same_dir, rev, copied, workspace, d) f.write('# original_files: %s\n' % ' '.join(copied)) return af -def _cleanup_on_error(rf, srctree): - rfp = os.path.split(rf)[0] # recipe folder - rfpp = os.path.split(rfp)[0] # recipes folder - if os.path.exists(rfp): - shutil.rmtree(rfp) - if not len(os.listdir(rfpp)): - os.rmdir(rfpp) +def _cleanup_on_error(rd, srctree): + rdp = os.path.split(rd)[0] # recipes folder + if os.path.exists(rd): + shutil.rmtree(rd) + if not len(os.listdir(rdp)): + os.rmdir(rdp) srctree = os.path.abspath(srctree) if os.path.exists(srctree): shutil.rmtree(srctree) -def _upgrade_error(e, rf, srctree, keep_failure=False, extramsg=None): - if rf and not keep_failure: - _cleanup_on_error(rf, srctree) +def _upgrade_error(e, rd, srctree, keep_failure=False, extramsg=None): + if not keep_failure: + _cleanup_on_error(rd, srctree) logger.error(e) if extramsg: logger.error(extramsg) @@ -426,7 +425,7 @@ def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, srcsubdir_old, src try: rd = tinfoil.parse_recipe_file(fullpath, False) except bb.tinfoil.TinfoilCommandFailed as e: - _upgrade_error(e, fullpath, srctree, keep_failure, 'Parsing of upgraded recipe failed') + _upgrade_error(e, os.path.dirname(fullpath), srctree, keep_failure, 'Parsing of upgraded recipe failed') oe.recipeutils.patch_recipe(rd, fullpath, newvalues) return fullpath, copied @@ -568,10 +567,9 @@ def upgrade(args, config, basepath, workspace): new_licenses = _extract_licenses(srctree_s, (rd.getVar('LIC_FILES_CHKSUM') or "")) license_diff = _generate_license_diff(old_licenses, new_licenses) rf, copied = _create_new_recipe(args.version, md5, sha256, args.srcrev, srcbranch, srcsubdir1, srcsubdir2, config.workspace_path, tinfoil, rd, license_diff, new_licenses, srctree, args.keep_failure) - except bb.process.CmdError as e: - _upgrade_error(e, rf, srctree, args.keep_failure) - except DevtoolError as e: - _upgrade_error(e, rf, srctree, args.keep_failure) + except (bb.process.CmdError, DevtoolError) as e: + recipedir = os.path.join(config.workspace_path, 'recipes', rd.getVar('BPN')) + _upgrade_error(e, recipedir, srctree, args.keep_failure) standard._add_md5(config, pn, os.path.dirname(rf)) af = _write_append(rf, srctree_s, args.same_dir, args.no_same_dir, rev2, From patchwork Fri Aug 19 02:42:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11584 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 799DEC28B2B for ; Fri, 19 Aug 2022 02:43:45 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web12.50631.1660877016275441885 for ; Thu, 18 Aug 2022 19:43:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=CLtVMKoA; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id o7so3170174pfb.9 for ; Thu, 18 Aug 2022 19:43:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=4H6TW9DwKIBpd5IUA7JKyYE2coNrwEQSacOW1u+zvPU=; b=CLtVMKoARPOl4GntxC9QDcQp3MlgaAGI/dqoE7a7gFE407ZzufBBwFlHxzVJFukfdG RbEQ4cj8DVJ/1ilU/ow7pt0biBSGl+soFR/+TClIJeh22trASrum8mK9nip78/wqYJUN F8HG6O5Xx5hCKr/5xojZINF8CXNnWChNnp7CQHtiA7ZpA2gDbF+EAl+7iK5Ffm4p8dNQ UUzZP6pt4TbIz/yP6kebUO082VLTeyMtpSsJLrVcCgpjnTYX2HeNmR+fYsDxKCW4v9m9 z7vZFbWAw+SLOvQVuSaRnRecxH8HQnDFzwPfVgTUUityPCmliLLJU0aULAw5aPTI31Kz Qlnw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=4H6TW9DwKIBpd5IUA7JKyYE2coNrwEQSacOW1u+zvPU=; b=6ijI45pveXHGEi4SPC5gCrt+bI09js5RKqWcpzjmjyXF1xQ01bvJVDyzrhD/QmPngy VkfmuKuzRXg0dVhYee1vU1R6xTGi5HN1lPhqxiuJ3NZd9mMPU87OsuCirpOKPzDdIhYY Ua0wo9VM6vhSYUNBckOBweEQ/jxwGMCtrF0DPNaQSH+biPqtSyvGMSbSa/IfKaUx8MF+ frUvO2SAOBTySF22+DItEw/XBeqHaPpB1dIpE8oKQdR52jNtKIC3FTFZOQ/pycUQCfS1 cw92PiZsLKMYPLEJw4wl+n8G1/ZNNM5knG3PbxbMd5Lgvzyh2d3LYDrNS2NfRMSYOuDN a2+Q== X-Gm-Message-State: ACgBeo3LVjL7XXjB/ATjQs9b1p2pz4wC+LQ/iS4jPg1qEMWQwURAbHPj Wo9Eetf5/lrBxVF1r8yU8PJFmQjMs65Ce2cw X-Google-Smtp-Source: AA6agR4WSBEFv+68ooZF2sDNipJWfnAFSb5g6kYYXkPci1rdKXPKN93GXCb7C52eggAals1MKqNETA== X-Received: by 2002:aa7:8e91:0:b0:52d:8ebf:29a4 with SMTP id a17-20020aa78e91000000b0052d8ebf29a4mr5736222pfr.1.1660877015198; Thu, 18 Aug 2022 19:43:35 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/26] devtool/upgrade: catch bb.fetch2.decodeurl errors Date: Thu, 18 Aug 2022 16:42:35 -1000 Message-Id: <72bfdca08029c031cedc9dbbf366663632c1c8db.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169556 From: Alexander Kanavin Otherwise, workspace cleanup (removing bogus recipe and source tree) will not happen, leaving breakage behind. Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli (cherry picked from commit 74774f9b67580a8c56f605dfd4cc7b856bbeeae8) Signed-off-by: Steve Sakoman --- scripts/lib/devtool/upgrade.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index c57015eb40..39a1910a49 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -336,7 +336,10 @@ def _create_new_recipe(newpv, md5, sha256, srcrev, srcbranch, srcsubdir_old, src replacing = True new_src_uri = [] for entry in src_uri: - scheme, network, path, user, passwd, params = bb.fetch2.decodeurl(entry) + try: + scheme, network, path, user, passwd, params = bb.fetch2.decodeurl(entry) + except bb.fetch2.MalformedUrl as e: + raise DevtoolError("Could not decode SRC_URI: {}".format(e)) if replacing and scheme in ['git', 'gitsm']: branch = params.get('branch', 'master') if rd.expand(branch) != srcbranch: From patchwork Fri Aug 19 02:42:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11583 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 80ECFC25B0E for ; Fri, 19 Aug 2022 02:43:45 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.50699.1660877018260547942 for ; Thu, 18 Aug 2022 19:43:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=zEq8cRjH; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id e19so2196063pju.1 for ; Thu, 18 Aug 2022 19:43:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=6xpfFpxmFKd9Ft4+2jwLGWyjmppeLBRaI9OWxSngNFw=; b=zEq8cRjHo+YZJarGpUjzVWx6M7FTsgjGaWh7uhEMH1awFfrEj3jXBXielT+njVT31W JQ+iVSgovUbbqzxC54+3elqZXZPGHaihzGqr7Br1RMkvdoLNBIRBuX0C9UN/fV76xQE3 9m5YWXX4eul6WHzkwc7qIGuPFVVEPVUlOdlVPRDCQPHF36f9tED3J7RBZCF6uYDrf5Gj qZa280zS7Pke95jVR50nW5VAGhF6EeZypWCqrz1COWlQuPpYslztUz6NfUPQ6gChvgrT UBhOpt4fgutHvPQHp4Qpm8EOc6dcSmekiSgvan/NA1uIw11m2UYAlRFPcBl6qj7oPn6h PDeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=6xpfFpxmFKd9Ft4+2jwLGWyjmppeLBRaI9OWxSngNFw=; b=pOtUtjNauC8PCL+PxhFuvLM0rbAEoCgi7j3F6q5+3W6c2yo6DzBpioGBDueAJ9MNr0 8fjpx/toHkvBIATQQVuPfzXEXqtILZPsLqIv74D5TcTiVEhdftOSnblI8pqeOU/OrDNK oR5jD+kWLGEEI1RtRB+a5loICnVFf2Wx2bXbgfz40eu/vzlIf6gzYpgVWdO2gSxlSwGV GiVRAvHp3DZEXrKADKJmW43Mo3wMpm5uoAyyP7MENvA1RoTrxO+B6BpSojUCDkJ7bOls OLT8kOfIOBZ4f6yp+HCFcvbLh39h4CLASdnF02lVUAEElR8yhMyCvQWCQkn1DuUzycHz cz4g== X-Gm-Message-State: ACgBeo3l+TZJKMPnJbyvxJ4C4+KsN80kfLVW2ShXt3B6nzHTYErowgdt xkX9B+NfJ4SVW1nfHinNLCIww9GFUnEebCPV X-Google-Smtp-Source: AA6agR47iBtttMJzRnqNJFe/hjdjXLCEOcymAE45yViSPE2tJg9U5s0rws8oEWuNHDhwx4PzQ137Aw== X-Received: by 2002:a17:90a:ee88:b0:1fa:aac3:6fb7 with SMTP id i8-20020a17090aee8800b001faaac36fb7mr5956212pjz.62.1660877017395; Thu, 18 Aug 2022 19:43:37 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/26] runqemu: Add missing space on default display option Date: Thu, 18 Aug 2022 16:42:36 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169557 From: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Mark Hatle Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit ee9428611fc38bc711b5b3e12cf0d3257b1b5680) Signed-off-by: Steve Sakoman --- scripts/runqemu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/runqemu b/scripts/runqemu index 6e1f073ed2..24c4a40b50 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -1375,7 +1375,7 @@ class BaseConfig(object): elif "-display sdl" in output: self.sdl = True else: - self.qemu_opt += '-display none' + self.qemu_opt += ' -display none' if self.sdl == True or self.gtk == True or self.egl_headless == True: From patchwork Fri Aug 19 02:42:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11582 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 80EFEC32789 for ; Fri, 19 Aug 2022 02:43:45 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web11.50679.1660876993920883649 for ; Thu, 18 Aug 2022 19:43:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Oigwb1+6; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id s3-20020a17090a2f0300b001facfc6fdbcso2932179pjd.1 for ; Thu, 18 Aug 2022 19:43:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=H08WO+CADCSbagt5JglzSlD3Q3/XxSNfkcDSeFg7uy0=; b=Oigwb1+6QBK89GleU0xVkML9Rb9KV2laeYfGazKO6L16998Xts5EwIs17DMfY6WHB1 93d3EfCm/Fm5K307HCsTrHFm8Qgd+gH3XWV0ZveGHejwyn5xeBTIet/c420lmsynM35u B3cKagBvmJzRApZULsO6xMLu7OnJZat/VDon+jkIELdKU8HjwOfHDT0Ct0myc/wTD3Xh rZYcZJla6GwzksEqikFfHY+hpsbDCDtHbofTDvkmIhGQ9S9yDj0Zli0/4yYGyIDCfKIr W1jZ5WYqxnXZP8C5fHP2WQgSmfHT2DdxLSktI0/JOWclj8o1uXIyLNH3OmU1YSyGkBbM LhcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=H08WO+CADCSbagt5JglzSlD3Q3/XxSNfkcDSeFg7uy0=; b=znKOxzHz1hWwFm0k2RCg0uLo5+kQ4zoUiLEBBKKm4KQjbC3VoulFN5k9kG5aJyZzHs hQdvyPUwo/35Id2UKcygAoDosbpprnoyduRATMW073NT07rlLS3VHxv9ryBvsIu8D8dy ++HHBJvIEPSfOHom6+Ri8mYIy3sEUdJgQMGBXJKVYy4klWqjdSC4dRgNdE61Wczm6DMH OynFV7A/bmafwzOKff1Ymra3z2O9CnaT2+clwdgyVpoG+MSkYDonGhEaL47x/1RUy9GF 4uviLjkc6HquVRW2pPlNmdWffGd/iEPpdkWpfXGpPlkruoYIExUJQJpXYnLRUkLV3dXP dNMA== X-Gm-Message-State: ACgBeo1L7/rHLSCRW3Qc0Hdl7CRE598S9PRo6v56ZTGraazd+teFHCdD iXVtRfPRYEB1Raa1tZAma4fVQZ4qpcmvX4gP X-Google-Smtp-Source: AA6agR6fyS8W+mGMfjv1OD7k8RXeLpnWk3kElbZlZgEEsIJeqIZtw5KDOm4N7C9Rh5O500SK/XsrGA== X-Received: by 2002:a17:903:291:b0:172:ba83:71a8 with SMTP id j17-20020a170903029100b00172ba8371a8mr3649885plr.65.1660877019542; Thu, 18 Aug 2022 19:43:39 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:38 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/26] archiver.bbclass: remove unsed do_deploy_archives[dirs] Date: Thu, 18 Aug 2022 16:42:37 -1000 Message-Id: <31ed9d68cca4788c48e1e7c470218b80df61baa4.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169558 From: Jose Quaresma Remove as commit b3afe7d redifines it. https://git.openembedded.org/openembedded-core/commit/?id=b3afe7d9bd25a943e947de3ec064ea245173c5a8 Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit cf5e155a9c76a6e4ed7145118e7367ab6f2f53f2) Signed-off-by: Steve Sakoman --- meta/classes/archiver.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 33070cd17f..5da369d422 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -69,7 +69,6 @@ SSTATE_ALLOW_OVERLAP_FILES += "${DEPLOY_DIR_SRC}/mirror" do_dumpdata[dirs] = "${ARCHIVER_OUTDIR}" do_ar_recipe[dirs] = "${ARCHIVER_OUTDIR}" do_ar_original[dirs] = "${ARCHIVER_OUTDIR} ${ARCHIVER_WORKDIR}" -do_deploy_archives[dirs] = "${WORKDIR}" # This is a convenience for the shell script to use it From patchwork Fri Aug 19 02:42:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11580 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 75BD8C00140 for ; Fri, 19 Aug 2022 02:43:45 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.50699.1660877018260547942 for ; Thu, 18 Aug 2022 19:43:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=m9Gla4EQ; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id e19so2196157pju.1 for ; Thu, 18 Aug 2022 19:43:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=qe8mVxZcV2W+zWLORsOsF3SZHdmWfCFIWZE9/jCzIuA=; b=m9Gla4EQsnUmeoK0lCO5kD3qayl2lYfhiO8oP4ZkqkYR74InryrnwIB401fUDYOSB+ pOv/VV287WjiYPTIRagiqVYgCsCWu0sb6L+R2vIWIRkeaWXq35J1Fdi+SmY/FLWC5XPu 2FefEJcUCKM45FbD3dB5HoYwr0FyNzKC6k71XCmyPdpgg2GM4lyeneJxKHYhrwSVMjEn tSzk2sM21xamVqa6vanl2IBKaFyeGrG9Ligwp67+HV3bpMN5rHuJg3S/s/hMaIPiX4EX TgLVBbTT3LFXuqeNvinGfXPBA9yWwAoeJ9GRrHzfgz+nqFsdI8Iedl7yRaaaiEt6Yb+L cPwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=qe8mVxZcV2W+zWLORsOsF3SZHdmWfCFIWZE9/jCzIuA=; b=l7xtd1BY8+QTwleVpzylw6naLBXD0wUh31hb1pDM626R5cDadRRj3O7RmoU6w6Hjk9 hcuBp289c6nwHHv9OnFtKht1u/oy4M6muKssBEBtkuMN1fDY88rYYR7I+WGoOtCiBhPd I7LXTB3x17/BUtcTZGqbyy9AKbu3xF3XVglQ8q1NON8hV4FURMa7o8c8spM7G+NJ8Hgv 61/FDdko3WKpeQrhvGKqoY7NBVz1QKqM4Ma9XTHB9AbiHX8wZ+DST6pZ0c/U7mY4xHdB AvFKchD+Qm9PUsVvEWDmw41UD1RxLqqU7At5C0rFj8MvdpDX0/Ap5KKpDcC6qN8PtDX9 5UjA== X-Gm-Message-State: ACgBeo1PKQQMbKxbWPsLj3TpbJZjzr0BIHqtwKxGTdWMf73twZYBZXKe QArssi2TuiUunAACal6/y/zegUpuHrTVXF9W X-Google-Smtp-Source: AA6agR5kFdu8UwqXipt16EKUY3jBzE2t2NRn5NtOK0TFqFeUCCHYWJdXkJ82tKI/y7Qvx+H0Haqc8w== X-Received: by 2002:a17:902:f712:b0:171:29d0:6f9f with SMTP id h18-20020a170902f71200b0017129d06f9fmr5380245plo.84.1660877021559; Thu, 18 Aug 2022 19:43:41 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:40 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 16/26] create-spdx: Fix supplier field Date: Thu, 18 Aug 2022 16:42:38 -1000 Message-Id: <504b50aec662f177fea452e05e29af8b36ca69fc.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169559 From: Mihai Lindner The correct field name is "supplier" according to SPDX schema. The "supplier" field translates to "PackageSupplier", but that's for tag-value format. Signed-off-by: Mihai Lindner Signed-off-by: Richard Purdie (cherry picked from commit ca8db0e0a2860ac1e3f537471fa71b43c3be0a58) Signed-off-by: Steve Sakoman --- meta/classes/create-spdx.bbclass | 6 +++--- meta/lib/oe/spdx.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index 37b6b569a1..f6827fccf7 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass @@ -445,7 +445,7 @@ python do_create_spdx() { recipe.name = d.getVar("PN") recipe.versionInfo = d.getVar("PV") recipe.SPDXID = oe.sbom.get_recipe_spdxid(d) - recipe.packageSupplier = d.getVar("SPDX_SUPPLIER") + recipe.supplier = d.getVar("SPDX_SUPPLIER") if bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d): recipe.annotations.append(create_annotation(d, "isNative")) @@ -555,7 +555,7 @@ python do_create_spdx() { spdx_package.name = pkg_name spdx_package.versionInfo = d.getVar("PV") spdx_package.licenseDeclared = convert_license_to_spdx(package_license, package_doc, d, found_licenses) - spdx_package.packageSupplier = d.getVar("SPDX_SUPPLIER") + spdx_package.supplier = d.getVar("SPDX_SUPPLIER") package_doc.packages.append(spdx_package) @@ -895,7 +895,7 @@ def combine_spdx(d, rootfs_name, rootfs_deploydir, rootfs_spdxid, packages): image.name = d.getVar("PN") image.versionInfo = d.getVar("PV") image.SPDXID = rootfs_spdxid - image.packageSupplier = d.getVar("SPDX_SUPPLIER") + image.supplier = d.getVar("SPDX_SUPPLIER") doc.packages.append(image) diff --git a/meta/lib/oe/spdx.py b/meta/lib/oe/spdx.py index 14ca706895..6d56ed90df 100644 --- a/meta/lib/oe/spdx.py +++ b/meta/lib/oe/spdx.py @@ -218,7 +218,7 @@ class SPDXPackage(SPDXObject): SPDXID = _String() versionInfo = _String() downloadLocation = _String(default="NOASSERTION") - packageSupplier = _String(default="NOASSERTION") + supplier = _String(default="NOASSERTION") homepage = _String() licenseConcluded = _String(default="NOASSERTION") licenseDeclared = _String(default="NOASSERTION") From patchwork Fri Aug 19 02:42:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11581 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 75C13C3F6B0 for ; Fri, 19 Aug 2022 02:43:45 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web10.50699.1660877018260547942 for ; Thu, 18 Aug 2022 19:43:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=GvOMmcOo; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id e19so2196204pju.1 for ; Thu, 18 Aug 2022 19:43:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=a4D0VR3LnvgdbIyl0E7iU7lJwyA39nVgAR6kLNwNhBc=; b=GvOMmcOoQq3X2SyO+ov9o918QDKpD1qyqRxaYMZ1BZ0bttr05M+3xgsLexsb6Sp92k hgZtFPuZBnWumXau6vRvQ6nizgqqG5ILsPMC4Gy5nFJNlFc5z6n9kz+F4X3FlO4GnG6K kWJQrwliudLcAsXQPC4YyJRDE0WCDM5rQeO/jYzL8Mlm0VRLLep2I88EkOZFCqvL1UsH 4X/l8rzRycLBo/bkpc7qEhbCPNcK7lQeeCyNIDFA3myvYL6A5iQjCi9JnvKBrQdecqJC dhCG5jNF18dUdMUS0Y7LKV1cQlBeptdzLbRdDxeYIvXAzI2WVi854XA+KNWOiMjWU8bc OC/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=a4D0VR3LnvgdbIyl0E7iU7lJwyA39nVgAR6kLNwNhBc=; b=ZYhsuJ5D79MYYwZjOK4sldKMMJmY+sIfCZzeHD799pZEqgXQZUE62BCXXnyCybZ1Lq 9eZibOeJfrBGlTIvbUI52DtjAis6PhbQFcAlS96czmwwcZQbJg5zbVl8fyiZDNcfWe/9 EeOJuIT5X2yZPOzX4fxSR5zKkOG0QUB0UcR4RDB72/OCGZN9j4B8/9wgKz8SJSN1sS0b be/FE31CWBGi82uLdKuALHkpSJisnebf2ajSNVLuhWdmkJ6ijp+I0Ae4+1Ape/hFMZNv WNkiHaINoDl4I9ekRwGcEca/fKJxhCAaKWd77bCvrDWvbF1x5zonH8HytA78+fR1wDLC KZjw== X-Gm-Message-State: ACgBeo3k1HJxS18XVvAhY36A/5k+XptFWxAyT2D0T1cAw87Kgnhql9QB LgI1YMwSNgVPhKLPv8BXK30kwipOSwO9nZgH X-Google-Smtp-Source: AA6agR4Y1Ci1OPUfNIfr2ZMfiUSsSFf8ZgpdWPTHTuk4u4kywjpVEZ8MuNPsoqtw+yAPulwqyzDGCw== X-Received: by 2002:a17:903:244c:b0:171:55cf:a930 with SMTP id l12-20020a170903244c00b0017155cfa930mr5361209pls.35.1660877023610; Thu, 18 Aug 2022 19:43:43 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 17/26] create-spdx: ignore packing control files from ipk and deb Date: Thu, 18 Aug 2022 16:42:39 -1000 Message-Id: <90799920339e121c9fdf385258927f8d6a6405eb.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:45 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169560 From: Jose Quaresma Otherwise spdx can have references for data that is not packed in the package delivered because this contol data is temporarly and only exist while the package is been write. During do_package_write_ipk task in do_package_ipk the control files is cleaned up at the end. This can create a race condiction when the do_create_spdx task runs the add_package_files function and these files is been deleted at same time in the task do_package_write_ipk. ERROR: alsa-topology-conf-1.2.5.1-r0 do_create_spdx: Error executing a python function in exec_func_python() autogenerated: The stack trace of python calls that resulted in this exception/failure was: File: 'exec_func_python() autogenerated', lineno: 2, function: 0001: *** 0002:do_create_spdx(d) 0003: File: '/srv/oe/build/conf/../../layers/openembedded-core/meta/classes/create-spdx.bbclass', lineno: 567, function: do_create_spdx 0563: package_doc.add_relationship(package_doc, "DESCRIBES", spdx_package) 0564: 0565: package_archive = deploy_dir_spdx / "packages" / (package_doc.name + ".tar.zst") 0566: with optional_tarfile(package_archive, archive_packaged) as archive: *** 0567: package_files = add_package_files( 0568: d, 0569: package_doc, 0570: spdx_package, 0571: pkgdest / package, File: '/srv/oe/build/conf/../../layers/openembedded-core/meta/classes/create-spdx.bbclass', lineno: 234, function: add_package_files 0230: info.mtime = source_date_epoch 0231: 0232: archive.addfile(info, f) 0233: *** 0234: sha1 = bb.utils.sha1_file(filepath) 0235: sha1s.append(sha1) 0236: spdx_file.checksums.append(oe.spdx.SPDXChecksum( 0237: algorithm="SHA1", 0238: checksumValue=sha1, File: '/srv/oe/bitbake/lib/bb/utils.py', lineno: 559, function: sha1_file 0555: """ 0556: Return the hex string representation of the SHA1 checksum of the filename 0557: """ 0558: import hashlib *** 0559: return _hasher(hashlib.sha1(), filename) 0560: 0561:def sha384_file(filename): 0562: """ 0563: Return the hex string representation of the SHA384 checksum of the filename File: '/srv/oe/bitbake/lib/bb/utils.py', lineno: 528, function: _hasher 0524: 0525:def _hasher(method, filename): 0526: import mmap 0527: *** 0528: with open(filename, "rb") as f: 0529: try: 0530: with mmap.mmap(f.fileno(), 0, access=mmap.ACCESS_READ) as mm: 0531: for chunk in iter(lambda: mm.read(8192), b''): 0532: method.update(chunk) Exception: FileNotFoundError: [Errno 2] No such file or directory: '/srv/oe/build/tmp-lmp/work/all-lmp-linux/alsa-topology-conf/1.2.5.1-r0/packages-split/alsa-topology-conf/CONTROL/control' ERROR: Logfile of failure stored in: /srv/oe/build/tmp-lmp/work/all-lmp-linux/alsa-topology-conf/1.2.5.1-r0/temp/log.do_create_spdx.998864 INFO: recipe alsa-topology-conf-1.2.5.1-r0: task do_create_spdx: Failed Signed-off-by: Jose Quaresma Signed-off-by: Luca Ceresoli (cherry picked from commit 0bfe403f46fd568910a727982c3ff528e3d5c8bc) Signed-off-by: Steve Sakoman --- meta/classes/create-spdx.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/create-spdx.bbclass b/meta/classes/create-spdx.bbclass index f6827fccf7..ae484328fb 100644 --- a/meta/classes/create-spdx.bbclass +++ b/meta/classes/create-spdx.bbclass @@ -571,6 +571,7 @@ python do_create_spdx() { pkgdest / package, lambda file_counter: oe.sbom.get_packaged_file_spdxid(pkg_name, file_counter), lambda filepath: ["BINARY"], + ignore_top_level_dirs=['CONTROL', 'DEBIAN'], archive=archive, ) From patchwork Fri Aug 19 02:42:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11586 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 752E4C3F6B0 for ; Fri, 19 Aug 2022 02:43:55 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web12.50629.1660877011766583774 for ; Thu, 18 Aug 2022 19:43:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xkVGc49L; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id m2so3043103pls.4 for ; Thu, 18 Aug 2022 19:43:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=lK7LEokjqLCCD+joUPQ17cEw2wkXmuIO6NqR1HNAMqg=; b=xkVGc49LOxLLHZw6ze/842TT8LPr7sHpDzs0WoYzWPVDe2ORYj7XAamCUFhKr7nVHn s4usIIku8OYmzAiUnuV3p1vP+aW/FCZXitqsqoQ9G0mTGNvDDBauYk7hwxf8W0szh2wV m+5aY00G7Aptm308ezQyH/4rcD0cH9ezuMQRsw2jj0WscTufQRQSxgQ1v+nTuBDhPQeZ IHClvvjqkMzzPrtvdT9axGdoSJkDGDr1lIHvRQd4WmfgeBfNTBHBpFcR+SdO/skgT3LP Yta5BQfzILSh2OuKf0MBtOQ19IjzuDoPqTODNYz8KNW/kRbe7fpZQmOm+1v7MaRJk3WD fj+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=lK7LEokjqLCCD+joUPQ17cEw2wkXmuIO6NqR1HNAMqg=; b=fQYdIH3GnvxpWIkDzUlPJ8GQnbnw+IHsRJzbBcTbWOfsyEPq1KmFrkCqz9GAwU2SwG fSCTKO2t5v0BxXQoXAkB4bE3UcWWrCo/5hMzfhcf+PsOaimjPoLYtFU4xFfjzwN5CnjA /Rb49uvIuOnadX356o9y2k8XUU5OHyHBVThyOAQERzE8WKUS9Z1Ns4mUuoY0TQ6ozP4Z Gi1vfeC6h4acIofXmXCT16GgbzGoFKxSN7s3ScWrQfUopOzsCBgCHDJQchpdK0bk+JV2 dJIBY/SLvGnRnzdkyeXXHKTM9gshesUJge2btFDsWuptnHl9QABR/5b03H61Htc4Fhqc C7zQ== X-Gm-Message-State: ACgBeo3X/4kWBrmtMbDXU2J9a2L3t80rHVwnsICxFvv1AFAl2Bn+9XKV qyQY33muhOtEBz4GSQ3BGRpfracMbhzPG2+d X-Google-Smtp-Source: AA6agR6hJVsrhC8+4HgL6FmhRI4wg7H9GdxSfWARsmGknV/cLMiV0iAVcufWbvrocw2zPUPapCq01g== X-Received: by 2002:a17:90b:4acc:b0:1f5:7f05:12e8 with SMTP id mh12-20020a17090b4acc00b001f57f0512e8mr5871651pjb.92.1660877025728; Thu, 18 Aug 2022 19:43:45 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 18/26] boost: fix install of fiber shared libraries Date: Thu, 18 Aug 2022 16:42:40 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169561 From: Mikko Rapeli For fiber, only CMake modules were installed in boost 1.78.0. In 1.79.0 and versions before 1.78.0 also the shared libraries are installed. This upstream patch fixes the issue in 1.78.0. Note that boost git repo does not show changes in tools/build directory between 1.78.0 and 1.79.0 tags but the release tar balls contain a large update of which this one is needed to fix the missing shared libraries. Only kirkstone is affected. buildhistory shows the difference in metadata boost-fiber binary package without and with this patch: --- a/packages/core2-64-poky-linux/boost/boost-fiber/latest +++ b/packages/core2-64-poky-linux/boost/boost-fiber/latest @@ -1,8 +1,9 @@ PV = 1.78.0 PR = r0 -RPROVIDES = -RDEPENDS = +PKG = libboost-fiber1.78.0 +RPROVIDES = boost-fiber (=1.78.0) +RDEPENDS = boost-context (>= 1.78.0) glibc (>= 2.35) libgcc (>= 11.3.0) libstdc++ (>= 11.3.0) RRECOMMENDS = -PKGSIZE = 0 +PKGSIZE = 80032 FILES = /usr/lib/libboost_fiber*.so.* -FILELIST = +FILELIST = /usr/lib/libboost_fiber.so.1.78.0 Signed-off-by: Mikko Rapeli Signed-off-by: Steve Sakoman --- ...ll-targets-if-there-s-build-no-in-ur.patch | 82 +++++++++++++++++++ meta/recipes-support/boost/boost_1.78.0.bb | 1 + 2 files changed, 83 insertions(+) create mode 100644 meta/recipes-support/boost/boost/0001-Don-t-skip-install-targets-if-there-s-build-no-in-ur.patch diff --git a/meta/recipes-support/boost/boost/0001-Don-t-skip-install-targets-if-there-s-build-no-in-ur.patch b/meta/recipes-support/boost/boost/0001-Don-t-skip-install-targets-if-there-s-build-no-in-ur.patch new file mode 100644 index 0000000000..df8b285700 --- /dev/null +++ b/meta/recipes-support/boost/boost/0001-Don-t-skip-install-targets-if-there-s-build-no-in-ur.patch @@ -0,0 +1,82 @@ +From 78fd284a42caabe8815cb0870b46e5567872e75b Mon Sep 17 00:00:00 2001 +From: Dmitry +Date: Sat, 11 Dec 2021 16:58:23 +0300 +Subject: [PATCH] Don't skip install targets if there's no in ureqs + (#113) + +--- + src/tools/stage.jam | 4 ++++ + test/install_build_no.py | 26 ++++++++++++++++++++++++++ + test/test_all.py | 1 + + 3 files changed, 31 insertions(+) + create mode 100755 test/install_build_no.py + +Fixes install of boost fiber shared libraries which are missing in 1.78.0 +but working in 1.79.0. Only kirkstone affected by this. + +Upstream-Status: Backport + +Signed-off-by: Mikko Rapeli + +diff --git a/tools/build/src/tools/stage.jam b/tools/build/src/tools/stage.jam +index c5f02e3ba..325129dc8 100644 +--- a/tools/build/src/tools/stage.jam ++++ b/tools/build/src/tools/stage.jam +@@ -478,6 +478,10 @@ class install-target-class : basic-target + return [ sequence.unique $(result2) ] ; + } + ++ rule skip-from-usage-requirements ( ) ++ { ++ } ++ + # Returns true iff 'type' is subtype of some element of 'types-to-include'. + # + local rule include-type ( type : types-to-include * ) +diff --git a/tools/build/test/install_build_no.py b/tools/build/test/install_build_no.py +new file mode 100755 +index 000000000..0ccf3c5cc +--- /dev/null ++++ b/tools/build/test/install_build_no.py +@@ -0,0 +1,26 @@ ++#!/usr/bin/python ++ ++# Copyright 2021 Dmitry Arkhipov (grisumbras@gmail.com) ++# Distributed under the Boost Software License, Version 1.0. ++# (See accompanying file LICENSE.txt or https://www.bfgroup.xyz/b2/LICENSE.txt) ++ ++# Check that no in usage-requirements of dependencies does not affect ++# install rule, i.e. a skipped installed target does not affect insallation of ++# other targets. ++ ++import BoostBuild ++ ++t = BoostBuild.Tester() ++ ++t.write("a.cpp", "int main() {}\n") ++ ++t.write("jamroot.jam", """ ++make x : : maker : no ; ++exe a : a.cpp ; ++install install : x a ; ++""") ++ ++t.run_build_system() ++t.expect_addition("install/a.exe") ++ ++t.cleanup() +diff --git a/tools/build/test/test_all.py b/tools/build/test/test_all.py +index b7ef5ad70..9ed729d01 100644 +--- a/tools/build/test/test_all.py ++++ b/tools/build/test/test_all.py +@@ -250,6 +250,7 @@ tests = ["abs_workdir", + "inherit_toolset", + "inherited_dependency", + "inline", ++ "install_build_no", + "libjpeg", + "liblzma", + "libpng", +-- +2.20.1 + diff --git a/meta/recipes-support/boost/boost_1.78.0.bb b/meta/recipes-support/boost/boost_1.78.0.bb index 58be9dcf12..08364a4c3c 100644 --- a/meta/recipes-support/boost/boost_1.78.0.bb +++ b/meta/recipes-support/boost/boost_1.78.0.bb @@ -7,4 +7,5 @@ SRC_URI += "file://boost-CVE-2012-2677.patch \ file://0001-dont-setup-compiler-flags-m32-m64.patch \ file://de657e01635306085488290ea83de541ec393f8b.patch \ file://0001-futex-fix-build-on-32-bit-architectures-using-64-bit.patch \ + file://0001-Don-t-skip-install-targets-if-there-s-build-no-in-ur.patch \ " From patchwork Fri Aug 19 02:42:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11587 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 8102DC25B0E for ; Fri, 19 Aug 2022 02:43:55 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web11.50689.1660877028751726426 for ; Thu, 18 Aug 2022 19:43:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=p0Av1Y0A; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id r15-20020a17090a1bcf00b001fabf42a11cso3596457pjr.3 for ; Thu, 18 Aug 2022 19:43:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=dOoXJOllQE9GDetXvOkEc3jTaXvy9GZFNyuVF/8DRRU=; b=p0Av1Y0AV4XxC00HE+NASsnwk1IxA534lQHsJQkiJ/whsZ4RK0cNevgQ6MAZ6iIrvn 5oQb1Y8D0Fp+4mfhLDp1Hz5FH1eYUSccNHO+grjJ5IDf1o3UEZ89Noxi3BE4+qPR4J05 x2CvIq7wOHC0C+huqYWr/eLu0XAAEfEI0DqhpGSA2fUt3AN/v7xgcvbNRjUyrtAsrmqu 3CgVBqpM2PacXLS9EmrfvWJkMTWyGhhbfHsvARhKwnVM6/nxaaejMROYgIbvZ3Mx63WO 0Iokeo0LGEKJNka05O9qZKBris6pwFH8Bkg0PVgX6M/iIKcJ7Kv0j3tTwjPeZA9Cb7RT sckg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=dOoXJOllQE9GDetXvOkEc3jTaXvy9GZFNyuVF/8DRRU=; b=1SYZOJGOs1/tUEqIMuzuD6CNCIU/SOJjIipehMVrsrmYRvHYnhwBlk0yI4khxkxy4x afqWhQimGlYwMmBl9xaWPJVTGeBAnsWNTws8UeB8J1DbMKi5K7LMtqwek0KlUlMTPXJP AcGi1K9Dexbk+KV2LGMTUK3YQCDg02h3muUEH5b4aoymJjA3q7JCwYB0ErU7Xd/j3cLZ cnh2LZXrm8bb+vsrwFSVRoPLVh3sbe1BhOw05Z+MmOx8LHI4UvTj4IdJtcQOB7EJ3sv8 2SgdNuAiRLY47O1xMBV3Gzi8MC7zPS3Qmw8QEDmhnBhzf59VfOsiWTPXARshzcpWv02I ytnQ== X-Gm-Message-State: ACgBeo17BGRnsdhW2UhTXURjpZFwstTOrAP5M2rE4V4lyl0xUpdbcXmO CodaB4Az/8oiC1Y273r2GnwVZEy3Lay+Si9+ X-Google-Smtp-Source: AA6agR719UFXS8vQRq6ZvHKLOF8RflaXUfyyIvtTSfrjMNbqectu+mvyhKBTyrXqqCQklOh5Q0AhNg== X-Received: by 2002:a17:90a:de13:b0:1f7:4bd3:36ec with SMTP id m19-20020a17090ade1300b001f74bd336ecmr11584786pjv.179.1660877027825; Thu, 18 Aug 2022 19:43:47 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:47 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 19/26] cmake: remove CMAKE_ASM_FLAGS variable in toolchain file Date: Thu, 18 Aug 2022 16:42:41 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169562 From: Martin Beeger As discussied in [YOCTO #14717] cmake contains a OEToolchainConfig.cmake file to configure the toolchain correctly in cross-compile build for recipes using cmake. The CMAKE_ASM_FLAGS are the configuration are meant for assembly, but the spelling is incorrect and the Flag is ASFLAGS for gcc and other compilers. So this variable might neever have worked and it is better for recipes to specify their own. Signed-off-by: Martin Beeger Signed-off-by: Luca Ceresoli (cherry picked from commit 72729ffbab53f95ee9dd1bc22913d9b864495930) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake index 86446c3ace..3ddef12c83 100644 --- a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake +++ b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake @@ -1,7 +1,6 @@ set( CMAKE_SYSTEM_NAME Linux ) set( CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "" FORCE ) set( CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE STRING "" FORCE ) -set( CMAKE_ASM_FLAGS ${CMAKE_C_FLAGS} CACHE STRING "" FORCE ) set( CMAKE_SYSROOT $ENV{OECORE_TARGET_SYSROOT} ) set( CMAKE_FIND_ROOT_PATH $ENV{OECORE_TARGET_SYSROOT} ) From patchwork Fri Aug 19 02:42:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11589 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 813F9C32774 for ; Fri, 19 Aug 2022 02:43:55 +0000 (UTC) Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by mx.groups.io with SMTP id smtpd.web10.50704.1660877030724476985 for ; Thu, 18 Aug 2022 19:43:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=rdDrxi15; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id y4so3049102plb.2 for ; Thu, 18 Aug 2022 19:43:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=sSZwc3hWfVtZ8TbuHjx2nfWGNNtO1inH26ayZ6yEYzs=; b=rdDrxi15+Seeo9tXf14LbbjOP4FCIqmGAW1EKBfny/P37DSVogayFwlaADtQJg+QDA NnkFNiN0zYBsvqNxfV3Lx4vdjsxxfaBruG18jVfVHyFo3mzUk45uW9YD9H6UPZcaafLU JqJSkFNokFMgl8CADgigUsfSI698jkhSut51BAoXrKi8LN4doZg0UKHwZ+aCvF7aoGKZ W2R2rC9Uu1cbk9i2eRfgmqCqUyKo56qL2H3innJQDo5R6fDG5kyoRbY13CwxyiR5Fh3N 5/lqLjOCXFz2pkkTK1vHiQTnH+GtkVuEKT4iOt29GMMiWh+Al+zLlaJbfvbeXiylFvhl BftA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=sSZwc3hWfVtZ8TbuHjx2nfWGNNtO1inH26ayZ6yEYzs=; b=BSZf+MjWylMkkS9zPXClyl4JwoLrnEqis19lAwhQ6q/bz9i18SPorQvbZx169oZQ9F C7dRGT2WSmGojVxNisSC/wq2jQUdAPdgXd5U+omGL2fhCLARzKmHA2HweAnHaa9qp2WC RDC5+tH38HS8eJmAsyFL21zhAvTzhHHX4Lf5KH3SgwPQ5KAr0435FgFKC20LAVMjI7PJ SnSUaZLoqg2l5TxstBo9Dk4M/lkM0DXHfQlrwfn0dCDgIozEzktH7mwJ1RMjdBCL2pdh KnLBJOdvvcyC4OXFySnE+lclSmAd79Ss2tnTbLheJKsCwd4f0lfk657Ue7PoZ0bBuHpF VZ4g== X-Gm-Message-State: ACgBeo2y0Y8zt8mIovctCP/92WdSskBJ3Q7e3q73EKHc2QRNFKgBqBXH Dj2c1TV3y8YnK3pz0f7hHl9l81TPAY/gYovt X-Google-Smtp-Source: AA6agR4zvN4d2/nDF6IwRrYhpQnWlzMclJ9WQeHRb41wf3X1CpiDqzEach8qlS6Rho4WGCAzYQLY/A== X-Received: by 2002:a17:902:dac7:b0:16e:fc21:4e17 with SMTP id q7-20020a170902dac700b0016efc214e17mr5073405plx.168.1660877029803; Thu, 18 Aug 2022 19:43:49 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:49 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 20/26] scripts/oe-setup-builddir: make it known where configurations come from Date: Thu, 18 Aug 2022 16:42:42 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169563 From: Alexander Kanavin "with some default values" isn't clear; if the user wants to change or inspect the default values and their history, we should help them find where they are. This becomes especially important when using template configs other than poky's. Signed-off-by: Alexander Kanavin Signed-off-by: Luca Ceresoli (cherry picked from commit ec34783ffc34eb9e9697f1b192c5a0043f1ca2c6) Signed-off-by: Steve Sakoman --- scripts/oe-setup-builddir | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 54048e62ec..5d644168cb 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -74,9 +74,10 @@ fi if [ ! -r "$BUILDDIR/conf/local.conf" ]; then cat < X-Patchwork-Id: 11585 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 7A515C28B2B for ; Fri, 19 Aug 2022 02:43:55 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web09.51218.1660877005707667355 for ; Thu, 18 Aug 2022 19:43:52 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Tj/rY+B8; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id u22so3023664plq.12 for ; Thu, 18 Aug 2022 19:43:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=Ea5/amMPeFQn9DrCko51+hLPEJJfYWIFWcMiemikxGM=; b=Tj/rY+B8BHdMUpnEOvMCl7GN2FyfpnDOTctEfaS/hXhOHUY3XLCPAdiZ2RDpjxmfYF VMNlVdWhPUQae4J9bYc6tOP3On7B4FQIBGExKLllKsReQ+VDnJ51Hg1/E49MEgu9fmQY +4vj6jUvCNL9eLk6WKJQ/dmH2xE6UM/TYiDt6z/KLzcPbcZzgYAu3sLRvIxbpbhK/mSe JrZ+FH9PLsD2CqG1U4NAQ7cqnj4o4m8Ed7Uu4YwCwhk1P7MZNyu4uVfDfdm5g73ZY/uY xxBc04J0PfhLfNSI09TUmVqZdT9IRlb6r1ur1SBIQTEXCaLLN9LJ0vDqA9lUIQmEnCCJ 2cAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=Ea5/amMPeFQn9DrCko51+hLPEJJfYWIFWcMiemikxGM=; b=X0L2+OZJABdg+8baYijFetNq6tAKuj+Ciio5qZ8i9JniJ5LaOHwY9upCXNABbuD/e8 pfJ7Ep4K6WPYPVnC49HmINMaKPqVmMl6AG17KMVcXRnsC/64gglLfbwXfq0RoWCvYmOR YzaaT7cH9UvjT55nxA3Bm6FbZ9qlKyf3l5j/FVdGHyZReaWyGr+1YZvcxpGiPF/TNhdF v6Swx2CAvRMTFWpOYRnfNlX/jBWuYCzrLLmPyzh2LJLLFuuc1XSMnFoU58+yCp5z9BjF SAVQcFjq1VFhSfjYStZinxBAC7j7Vsmx2PRalhILEPCgm495lqGbXwgXGm8kdv3kq+LS ewvw== X-Gm-Message-State: ACgBeo3+ecjKqISornqbt4dyfv+O0sptqcuWXpOLyL3gof+ivFKsdlO4 mBGlIJuKXYuj3KPsOawp0pjYF5Z4L9EWMgyO X-Google-Smtp-Source: AA6agR7XCGonE0RtrdgjDRZbtlZK50nJIm7OEV8VHpALpQDYka0yX1cEDNMLQ9FMNP1AAqkofqeciQ== X-Received: by 2002:a17:903:18a:b0:16f:e43:efdf with SMTP id z10-20020a170903018a00b0016f0e43efdfmr5109744plg.157.1660877031798; Thu, 18 Aug 2022 19:43:51 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:51 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 21/26] nativesdk: Clear TUNE_FEATURES Date: Thu, 18 Aug 2022 16:42:43 -1000 Message-Id: <394c1bb8c8148d65b6188586fd4b6d8edc39ab88.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169564 From: Richard Purdie Similarly to what native.bbclass does, clear TUNE_FEATURES since these aren't appropriate to the nativesdk build. This saves us having to change down signature issues due to data in this variable. Signed-off-by: Richard Purdie (cherry picked from commit 2e5079e434504a3a22b609f7ddbb7f4c533c4cdb) Signed-off-by: Steve Sakoman --- meta/classes/nativesdk.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/nativesdk.bbclass b/meta/classes/nativesdk.bbclass index f8e9607513..e46739e325 100644 --- a/meta/classes/nativesdk.bbclass +++ b/meta/classes/nativesdk.bbclass @@ -55,6 +55,7 @@ TARGET_CXXFLAGS = "${BUILDSDK_CXXFLAGS}" TARGET_LDFLAGS = "${BUILDSDK_LDFLAGS}" TARGET_FPU = "" EXTRA_OECONF_GCC_FLOAT = "" +TUNE_FEATURES = "" CPPFLAGS = "${BUILDSDK_CPPFLAGS}" CFLAGS = "${BUILDSDK_CFLAGS}" From patchwork Fri Aug 19 02:42:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11588 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 74977C00140 for ; Fri, 19 Aug 2022 02:43:55 +0000 (UTC) Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by mx.groups.io with SMTP id smtpd.web10.50705.1660877034840405650 for ; Thu, 18 Aug 2022 19:43:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=XGNLZ4yo; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id 20so3024491plo.10 for ; Thu, 18 Aug 2022 19:43:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=dzSTQ4DnNjmC2Sgy2MlPUfV8JyApt+xd3ht6SfjqX6s=; b=XGNLZ4yod0WYwkHt/wVEmc+VS/DuW5/HAYbi7cyqNqHaSqDkb0XpmgnFX6GVFJKHmw xwJxR/uq+1QinPojHJvRInQcADaPzGVc0vVV2Hzm7Hc4cvcK/mfppiN14HB75zkuTfU1 M4cSWrw1Q30OX5mnjqYsxB3DCp1k/t9vEqcJGi6U/Bb8QN/zOtz/9d2bQQURaXCDJopm hvdx5UlkHFKwch5jKfkaXf8BW6edy2Ieqh65JLoEoSoFjst5/OXJuVVfxX/lSgGMCPLq P9OLx7YyGMgLhrOtxqIOqMebYdOveZEIhsfgVt5N//gsS61uUaXCboVrAdOt/ic95t2Q CMbA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=dzSTQ4DnNjmC2Sgy2MlPUfV8JyApt+xd3ht6SfjqX6s=; b=62wBH2c59aHJamd58FJ01nOzPH9oA2pbkKMJPe9wDNlDEYHhFAsU63Jjrnj6UWFfBQ ztJ14IZM5A08nf10D59cSbgfyd4LP3GRYO6+Ynlen3AvoibelV8nL8G3paV7cUsagaft msb1zZG3QuOlNXXBupyeNYxsqvTio0oAQFzfIHG0nWt/H0BK7UFbbTZmUCWXT0IeOrmb 2vntCrwexCkxkxs/nb5pw4YzgPNvh6jjBMGIP+fhVqDtDkK/Cwq6Pb3iQFjZWxsnG/nq UU2oMmOSYq3aZxq1APrQk0IDpGEnFedEbX8x4/XbpaLDu9RAV11ywtLxa9ol6RSBci9+ 0G3A== X-Gm-Message-State: ACgBeo2XvxMf3MgG0EbarxwpM5LZQ6LtEzRD5XdmoCnQmkgVq/kggQSa mcj6xgsFrETkLP2vyoD0pFXdiePfmXv0tr5Q X-Google-Smtp-Source: AA6agR6aqGiPEiDRGC+HeUHUSYmUd5oOEDvHM9QLHHb5nZD2AYvSWOuyr3jxo1vf2/uuO8a1A1hM7w== X-Received: by 2002:a17:903:2345:b0:16f:1f3:1ade with SMTP id c5-20020a170903234500b0016f01f31ademr5662798plh.106.1660877033946; Thu, 18 Aug 2022 19:43:53 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:53 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 22/26] relocate_sdk.py: ensure interpreter size error causes relocation to fail Date: Thu, 18 Aug 2022 16:42:44 -1000 Message-Id: <3f258378bcaebb9c42c0011c7c424c920ef71d22.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:43:55 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169565 From: Paul Eggleton If there is insufficent space to change the interpreter, we were printing an error here but the overall script did not return an error code, and thus the SDK installation appeared to succeed - but some of the binaries will not be in a working state. Allow the relocation to proceed (so we still get a full list of the failures) but error out at the end so that the installation is halted. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie (cherry picked from commit c5a9a448e462d3e5457e8403c5a1a54148ecd224) Signed-off-by: Steve Sakoman --- scripts/relocate_sdk.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/relocate_sdk.py b/scripts/relocate_sdk.py index 4ed8bfc0d1..8a728720ba 100755 --- a/scripts/relocate_sdk.py +++ b/scripts/relocate_sdk.py @@ -104,11 +104,12 @@ def change_interpreter(elf_file_name): if (len(new_dl_path) >= p_filesz): print("ERROR: could not relocate %s, interp size = %i and %i is needed." \ % (elf_file_name, p_memsz, len(new_dl_path) + 1)) - break + return False dl_path = new_dl_path + b("\0") * (p_filesz - len(new_dl_path)) f.seek(p_offset) f.write(dl_path) break + return True def change_dl_sysdirs(elf_file_name): if arch == 32: @@ -222,6 +223,7 @@ else: executables_list = sys.argv[3:] +errors = False for e in executables_list: perms = os.stat(e)[stat.ST_MODE] if os.access(e, os.W_OK|os.R_OK): @@ -247,7 +249,8 @@ for e in executables_list: arch = get_arch() if arch: parse_elf_header() - change_interpreter(e) + if not change_interpreter(e): + errors = True change_dl_sysdirs(e) """ change permissions back """ @@ -260,3 +263,6 @@ for e in executables_list: print("New file size for %s is different. Looks like a relocation error!", e) sys.exit(-1) +if errors: + print("Relocation of one or more executables failed.") + sys.exit(-1) From patchwork Fri Aug 19 02:42:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11592 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 79871C28B2B for ; Fri, 19 Aug 2022 02:44:05 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web12.50634.1660877037059821418 for ; Thu, 18 Aug 2022 19:43:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=C8bBjDtG; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id s4-20020a17090a5d0400b001fabc6bb0baso3786230pji.1 for ; Thu, 18 Aug 2022 19:43:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=McqRGTB/c0Ab2bd9gEfQwkV0zhFST+6RfgaLuV0EwhU=; b=C8bBjDtGAOneKF+CNeOd7vQbipsvI+L9gT7avogrIGpWpoMeYIGHgxkAo2aSPMq1d0 qOQC7ZJ1bL88uZVNZiYZ+t0TFoI5D0rUGkzOuk+qdlI0pV4IxvCqW0xOEUO5ZpIRkTyi nssWgeeY7iipkrNMxJ3A1HtgDsf4KCrjY5+k1FANwOWILX2Dqveb3wA5HCIdpTlt75O+ jL4JLVeESF05q2a7ejgYwTGCEAx92FKvF8DUhkoo1lzLq21XZQ8V52zQHBJKQFbt9Csx wkLKkO5Ypmy/t+RDzBA1dy26Ky7AG+vymlytbXmgJpoBYEybMGivwR537DCeQL+UuSOt gfyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=McqRGTB/c0Ab2bd9gEfQwkV0zhFST+6RfgaLuV0EwhU=; b=1645OqNX7VALlMmrUQelkObNuUlP4j8/nB7mlHbbiJMAx3B2zwQpjOZIBqHuxXtzkn JhwmjFYMUzHQsfdIliz4LunE53/qZE4tcYVOupeRfiUPjeT4enF99aFaaVh6D5YxNOMa T8Qbzfb7tqiskv/51ax1j6/28SuoqT4lwhmDlftQN94Wpsm4cwr33bOi6k63EYZ4NE/k wtRhlJcO7upLOr+TOz0cT1QDgaH1GqgLoz2p32YA+qLzduhQBjmQdKLDLGMJeiEsEmQC 7iElCsloWeA7HGCM71QHXqzIpfAlq1fSMK7dq0C9CpHUSZKEnK8QSY2gHJD1GKe6CSVf mvnw== X-Gm-Message-State: ACgBeo0a6QSiIprOVoNTHGvB+9A9l3MN7jbaDwfR4yhRgZSQ8YOHDUuy 9rnPhb+omy8uGG1iNZjU9mbw7TOLYFoTStQa X-Google-Smtp-Source: AA6agR5aD4fDvi65PVCeOM0Stzf9dIL61sGyBnv2YHksRJ0OUKnlhNlKN8kYS+fHn8g6zdwTE8OIww== X-Received: by 2002:a17:903:120c:b0:172:728a:3b24 with SMTP id l12-20020a170903120c00b00172728a3b24mr5179053plh.61.1660877036133; Thu, 18 Aug 2022 19:43:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:55 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 23/26] selftest/wic: Tweak test case to not depend on kernel size Date: Thu, 18 Aug 2022 16:42:45 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:44:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169566 From: Richard Purdie The current test assumes the kernel size leaves a certain amount of whitespace in the output. Improve this constraint so a slightly larger kernel doesn't fail the test. Signed-off-by: Richard Purdie (cherry picked from commit bd60c44bef4a1b5d3c8fe77a9e6d3a8f43b0dea4) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/wic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index de74c07a03..49fb6fe52c 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -1420,7 +1420,7 @@ class ModifyTests(WicTestCase): # list directory content of the first partition result = runCmd("wic ls %s:1 -n %s" % (images[0], sysroot)) - self.assertIn('\n%s ' % kerneltype.upper(), result.output) + self.assertIn('\n%s ' % kerneltype.upper(), result.output) self.assertIn('\nEFI ', result.output) # remove file. EFI partitions are case-insensitive so exercise that too From patchwork Fri Aug 19 02:42:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11593 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 8A01DC25B0E for ; Fri, 19 Aug 2022 02:44:05 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web08.50685.1660877039527976635 for ; Thu, 18 Aug 2022 19:43:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=PEP2C0My; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id d71so2685687pgc.13 for ; Thu, 18 Aug 2022 19:43:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=a76cGIPbeTuOK9nCH1navHScmOyX++6w0yqy0n3Qytc=; b=PEP2C0My3PexdFU8aavQgPcvzJZfQLb2YjrGGE4i34Hoihafw1ga6GJhHsNr3/DFZG 5fT1YakwEKiXfLyNDvz8NXMp5YBSSe1VqvUh+6Q4VSYTpnqiABhQbdA4a7+6Kzmf/PYS reaClrybsjAFKji8zlW7QaM0InWHclR4gu9o0UCCTJ66VtVerejJUgehmLUyoBPOhLKB kmTVxhqRqGR611uKu8mP+/vIzBnegyhKE13Ekl2iEgYEItlIslwtUjydWjX5qn0Ns6HS V6+VcMSwTg3zRHTrGmpFLUkCngo5zjCEAJRnwGr+l4X3/wz9wKd379cBcUprKWP+iQfB YAtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=a76cGIPbeTuOK9nCH1navHScmOyX++6w0yqy0n3Qytc=; b=E0k4/hom5Q2Q4stUOE4GlhD5WeHrJxFnaWFmFCyqeCadPxzZGDcmh3Dv8NR29UIwf2 oDK4x73l559VP1suet6hupy8Cs/tbH3weghJcA7YFuw7jNswo0mouneKEe1dyZjyyyhW FZOQfQKFYkaUcud+s98Rk6dGQwaQr74SyEkRcVY4GkvIRD0/mcp9GuR2gl8DQh8bPJN5 lEHPdsXBimrGxR6jKSFE1EEjj6z6+3lQUtghWE3zaXNeXw35aioOUIPK5fsCvmNEP1G2 8nOgtVVs0LzQ4nn0GtGfCoFiR9DKY6MJyhLXG2cpr4ZCpIi961r+JOKyDRFlHvuMUwCx G9cg== X-Gm-Message-State: ACgBeo1csyL5FfE77o4ZmHnKDjoNaxx6KHvrxdxZFJExqaXAzd1Wi9eh 5J5L+/mfNpPNzlVYzyfkOgb4SxW2JyZKeRUv X-Google-Smtp-Source: AA6agR7DxkfcGpOxt21jXpUVmoa1mCaTd0o8XOc865FDyKwQIlxZJBInscSktUGbaHSWHe21LLwBpA== X-Received: by 2002:a05:6a00:16c1:b0:520:6ede:24fb with SMTP id l1-20020a056a0016c100b005206ede24fbmr5780532pfc.7.1660877038284; Thu, 18 Aug 2022 19:43:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:57 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 24/26] lttng-modules: fix 5.19+ build Date: Thu, 18 Aug 2022 16:42:46 -1000 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:44:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169567 From: Bruce Ashfield We need to backport three patches from the lttng upstream tree to fix the build against 5.19+. Obviously we'll drop these once the next lttng-modules release is available. (From OE-Core rev: dce3c772efab4e51a82fb9c8fb74bc614ee3a82e) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie Signed-off-by: Naveen Saini Signed-off-by: Steve Sakoman --- ...c-fix-tracepoint-mm_page_alloc_zone_.patch | 106 +++++++++++++++ ...ags-parameter-from-aops-write_begin-.patch | 76 +++++++++++ ...Fix-type-of-cpu-in-trace-event-v5.19.patch | 124 ++++++++++++++++++ .../lttng/lttng-modules_2.13.4.bb | 3 + 4 files changed, 309 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch new file mode 100644 index 0000000000..62376806c8 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch @@ -0,0 +1,106 @@ +From 8d5da4d2a3d7d9173208f4e8dc7a709f0bfc9820 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Wed, 8 Jun 2022 12:56:36 -0400 +Subject: [PATCH 1/3] fix: mm/page_alloc: fix tracepoint + mm_page_alloc_zone_locked() (v5.19) + +See upstream commit : + + commit 10e0f7530205799e7e971aba699a7cb3a47456de + Author: Wonhyuk Yang + Date: Thu May 19 14:08:54 2022 -0700 + + mm/page_alloc: fix tracepoint mm_page_alloc_zone_locked() + + Currently, trace point mm_page_alloc_zone_locked() doesn't show correct + information. + + First, when alloc_flag has ALLOC_HARDER/ALLOC_CMA, page can be allocated + from MIGRATE_HIGHATOMIC/MIGRATE_CMA. Nevertheless, tracepoint use + requested migration type not MIGRATE_HIGHATOMIC and MIGRATE_CMA. + + Second, after commit 44042b4498728 ("mm/page_alloc: allow high-order pages + to be stored on the per-cpu lists") percpu-list can store high order + pages. But trace point determine whether it is a refiil of percpu-list by + comparing requested order and 0. + + To handle these problems, make mm_page_alloc_zone_locked() only be called + by __rmqueue_smallest with correct migration type. With a new argument + called percpu_refill, it can show roughly whether it is a refill of + percpu-list. + +Upstream-Status: Backport + +Change-Id: I2e4a57393757f12b9c5a4566c4d1102ee2474a09 +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +--- + include/instrumentation/events/kmem.h | 45 +++++++++++++++++++++++++++ + 1 file changed, 45 insertions(+) + +diff --git a/include/instrumentation/events/kmem.h b/include/instrumentation/events/kmem.h +index 29c0fb7f..8c19e962 100644 +--- a/include/instrumentation/events/kmem.h ++++ b/include/instrumentation/events/kmem.h +@@ -218,6 +218,50 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_page_alloc, kmem_mm_page_alloc, + ) + ) + ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) ++LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page, ++ ++ TP_PROTO(struct page *page, unsigned int order, int migratetype, ++ int percpu_refill), ++ ++ TP_ARGS(page, order, migratetype, percpu_refill), ++ ++ TP_FIELDS( ++ ctf_integer_hex(struct page *, page, page) ++ ctf_integer(unsigned long, pfn, ++ page ? page_to_pfn(page) : -1UL) ++ ctf_integer(unsigned int, order, order) ++ ctf_integer(int, migratetype, migratetype) ++ ctf_integer(int, percpu_refill, percpu_refill) ++ ) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_alloc_zone_locked, ++ ++ kmem_mm_page_alloc_zone_locked, ++ ++ TP_PROTO(struct page *page, unsigned int order, int migratetype, ++ int percpu_refill), ++ ++ TP_ARGS(page, order, migratetype, percpu_refill) ++) ++ ++LTTNG_TRACEPOINT_EVENT_MAP(mm_page_pcpu_drain, ++ ++ kmem_mm_page_pcpu_drain, ++ ++ TP_PROTO(struct page *page, unsigned int order, int migratetype), ++ ++ TP_ARGS(page, order, migratetype), ++ ++ TP_FIELDS( ++ ctf_integer(unsigned long, pfn, ++ page ? page_to_pfn(page) : -1UL) ++ ctf_integer(unsigned int, order, order) ++ ctf_integer(int, migratetype, migratetype) ++ ) ++) ++#else + LTTNG_TRACEPOINT_EVENT_CLASS(kmem_mm_page, + + TP_PROTO(struct page *page, unsigned int order, int migratetype), +@@ -250,6 +294,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(kmem_mm_page, mm_page_pcpu_drain, + + TP_ARGS(page, order, migratetype) + ) ++#endif + + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,19,2) \ + || LTTNG_KERNEL_RANGE(3,14,36, 3,15,0) \ +-- +2.19.1 + diff --git a/meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch b/meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch new file mode 100644 index 0000000000..84c97d5f90 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch @@ -0,0 +1,76 @@ +From b5d1c38665cd69d7d1c94231fe0609da5c8afbc3 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Wed, 8 Jun 2022 13:07:59 -0400 +Subject: [PATCH 2/3] fix: fs: Remove flags parameter from aops->write_begin + (v5.19) + +See upstream commit : + + commit 9d6b0cd7579844761ed68926eb3073bab1dca87b + Author: Matthew Wilcox (Oracle) + Date: Tue Feb 22 14:31:43 2022 -0500 + + fs: Remove flags parameter from aops->write_begin + + There are no more aop flags left, so remove the parameter. + +Upstream-Status: Backport + +Change-Id: I82725b93e13d749f52a631b2ac60df81a5e839f8 +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +--- + include/instrumentation/events/ext4.h | 30 +++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) + +diff --git a/include/instrumentation/events/ext4.h b/include/instrumentation/events/ext4.h +index 513762c0..222416ec 100644 +--- a/include/instrumentation/events/ext4.h ++++ b/include/instrumentation/events/ext4.h +@@ -122,6 +122,35 @@ LTTNG_TRACEPOINT_EVENT(ext4_begin_ordered_truncate, + ) + ) + ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) ++LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin, ++ ++ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), ++ ++ TP_ARGS(inode, pos, len), ++ ++ TP_FIELDS( ++ ctf_integer(dev_t, dev, inode->i_sb->s_dev) ++ ctf_integer(ino_t, ino, inode->i_ino) ++ ctf_integer(loff_t, pos, pos) ++ ctf_integer(unsigned int, len, len) ++ ) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_write_begin, ++ ++ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), ++ ++ TP_ARGS(inode, pos, len) ++) ++ ++LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin, ++ ++ TP_PROTO(struct inode *inode, loff_t pos, unsigned int len), ++ ++ TP_ARGS(inode, pos, len) ++) ++#else + LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_begin, + + TP_PROTO(struct inode *inode, loff_t pos, unsigned int len, +@@ -153,6 +182,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(ext4__write_begin, ext4_da_write_begin, + + TP_ARGS(inode, pos, len, flags) + ) ++#endif + + LTTNG_TRACEPOINT_EVENT_CLASS(ext4__write_end, + TP_PROTO(struct inode *inode, loff_t pos, unsigned int len, +-- +2.19.1 + diff --git a/meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch b/meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch new file mode 100644 index 0000000000..63f9c40d92 --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch @@ -0,0 +1,124 @@ +From 526f13c844cd29f89bd3e924867d9ddfe3c40ade Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Wed, 15 Jun 2022 12:07:16 -0400 +Subject: [PATCH 3/3] fix: workqueue: Fix type of cpu in trace event (v5.19) + +See upstream commit : + + commit 873a400938b31a1e443c4d94b560b78300787540 + Author: Wonhyuk Yang + Date: Wed May 4 11:32:03 2022 +0900 + + workqueue: Fix type of cpu in trace event + + The trace event "workqueue_queue_work" use unsigned int type for + req_cpu, cpu. This casue confusing cpu number like below log. + + $ cat /sys/kernel/debug/tracing/trace + cat-317 [001] ...: workqueue_queue_work: ... req_cpu=8192 cpu=4294967295 + + So, change unsigned type to signed type in the trace event. After + applying this patch, cpu number will be printed as -1 instead of + 4294967295 as folllows. + + $ cat /sys/kernel/debug/tracing/trace + cat-1338 [002] ...: workqueue_queue_work: ... req_cpu=8192 cpu=-1 + +Upstream-Status: Backport + +Change-Id: I478083c350b6ec314d87e9159dc5b342b96daed7 +Signed-off-by: Michael Jeanson +Signed-off-by: Mathieu Desnoyers +--- + include/instrumentation/events/workqueue.h | 49 ++++++++++++++++++++-- + 1 file changed, 46 insertions(+), 3 deletions(-) + +diff --git a/include/instrumentation/events/workqueue.h b/include/instrumentation/events/workqueue.h +index 023b65a8..5693cf89 100644 +--- a/include/instrumentation/events/workqueue.h ++++ b/include/instrumentation/events/workqueue.h +@@ -28,10 +28,35 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work, + ) + ) + ++#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,19,0)) + /** + * workqueue_queue_work - called when a work gets queued + * @req_cpu: the requested cpu +- * @cwq: pointer to struct cpu_workqueue_struct ++ * @pwq: pointer to struct pool_workqueue ++ * @work: pointer to struct work_struct ++ * ++ * This event occurs when a work is queued immediately or once a ++ * delayed work is actually queued on a workqueue (ie: once the delay ++ * has been reached). ++ */ ++LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, ++ ++ TP_PROTO(int req_cpu, struct pool_workqueue *pwq, ++ struct work_struct *work), ++ ++ TP_ARGS(req_cpu, pwq, work), ++ ++ TP_FIELDS( ++ ctf_integer_hex(void *, work, work) ++ ctf_integer_hex(void *, function, work->func) ++ ctf_integer(int, req_cpu, req_cpu) ++ ) ++) ++#elif (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0)) ++/** ++ * workqueue_queue_work - called when a work gets queued ++ * @req_cpu: the requested cpu ++ * @pwq: pointer to struct pool_workqueue + * @work: pointer to struct work_struct + * + * This event occurs when a work is queued immediately or once a +@@ -40,17 +65,34 @@ LTTNG_TRACEPOINT_EVENT_CLASS(workqueue_work, + */ + LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, + +-#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,9,0)) + TP_PROTO(unsigned int req_cpu, struct pool_workqueue *pwq, + struct work_struct *work), + + TP_ARGS(req_cpu, pwq, work), ++ ++ TP_FIELDS( ++ ctf_integer_hex(void *, work, work) ++ ctf_integer_hex(void *, function, work->func) ++ ctf_integer(unsigned int, req_cpu, req_cpu) ++ ) ++) + #else ++/** ++ * workqueue_queue_work - called when a work gets queued ++ * @req_cpu: the requested cpu ++ * @cwq: pointer to struct cpu_workqueue_struct ++ * @work: pointer to struct work_struct ++ * ++ * This event occurs when a work is queued immediately or once a ++ * delayed work is actually queued on a workqueue (ie: once the delay ++ * has been reached). ++ */ ++LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, ++ + TP_PROTO(unsigned int req_cpu, struct cpu_workqueue_struct *cwq, + struct work_struct *work), + + TP_ARGS(req_cpu, cwq, work), +-#endif + + TP_FIELDS( + ctf_integer_hex(void *, work, work) +@@ -58,6 +100,7 @@ LTTNG_TRACEPOINT_EVENT(workqueue_queue_work, + ctf_integer(unsigned int, req_cpu, req_cpu) + ) + ) ++#endif + + /** + * workqueue_activate_work - called when a work gets activated +-- +2.19.1 + diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb index bee2204b42..fea0e383c9 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb @@ -11,6 +11,9 @@ include lttng-platforms.inc SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0009-Rename-genhd-wrapper-to-blkdev.patch \ + file://0001-fix-mm-page_alloc-fix-tracepoint-mm_page_alloc_zone_.patch \ + file://0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch \ + file://0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch \ file://0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch \ " From patchwork Fri Aug 19 02:42:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11591 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 77180C00140 for ; Fri, 19 Aug 2022 02:44:05 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web08.50685.1660877039527976635 for ; Thu, 18 Aug 2022 19:44:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=gj+3tlh0; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id d71so2685727pgc.13 for ; Thu, 18 Aug 2022 19:44:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=PyU5sVpiYpV6cdj17o0SnUD77Eh6kH9nKr/wgAQ+omU=; b=gj+3tlh0hMjWmEPvau/3AWhSMcddv4jX4tZEfuMmX6aq20eYN0mpSRX73krlSaOI4a IX9enu5e64Kx92CmByy6+dnqO/2J+kZfswwEKCiNFbzReHdZitLkLDL8PP5TexWI4Ter c5Ms9rvjEU76EMxmZfmWjkhy3SFRm+5uByKWxVGyaWgchYbh3huLHCw4UHlLM0g+5w0B fAfu8BtKAVd0ZK+Lk5QvX1tVZM/dLmrcJa8Jg4vvJOJfldO2ggiZUt0y2irmq2scizrU Pp1wgTzvcM+0+05shn1cl84TyG7FaNFmOcy3bHkTo6Owm+jkN+zpgrrV4RhCkWQBol2i AFNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=PyU5sVpiYpV6cdj17o0SnUD77Eh6kH9nKr/wgAQ+omU=; b=rNPxhqDhKHkOsck4S2WIcgu23OuuO5MkdIWkRSuuhc9wMJKtlUFCVhwTtfUr9qwcav TmOxPLQXOwZ2gZVGUoluNKtrVac6OJaisowYQ7tNh00Ejb65INgdyOtxOn4eM2Cf/9iY dnMvmY+ZAONFbt/IlEgPtYuCm9zoetJqodzppvgZNibBsc8CCX2hbzEmrmiq5BJ+HI7D PdxrMvq2CLx2EL6DEUFJwmANkJ+V1WWpoSCNm7ziSN6tVJxvejTA+xzB21+VBAbXcGvj bfoc2COdV973JTxX2aERXl/GD0/+2B4XY01PzbLx1kVCM34k2CrDLBS20xwUK6OQl+14 /j5g== X-Gm-Message-State: ACgBeo2tJUyesoBs8sRubZBh+naADpXgF3kQy7OhzemelEsGl1xAiGZb B+89xRqTMIZqIieSam9LrXMYmBcWEvlNYe4c X-Google-Smtp-Source: AA6agR53BH00FdLhrigFb0CsuSnj8UGhejATA3RKFs1J5475MBlsEUegMEmu+fDDUsE3BxUk5i6boA== X-Received: by 2002:a62:bd03:0:b0:536:150c:a1c0 with SMTP id a3-20020a62bd03000000b00536150ca1c0mr214582pff.19.1660877040511; Thu, 18 Aug 2022 19:44:00 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.43.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:43:59 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 25/26] lttng-modules: fix build against mips and v5.19 kernel Date: Thu, 18 Aug 2022 16:42:47 -1000 Message-Id: <86c10960e27efaa2958abcb0ca5cb2d6eea0480f.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:44:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169568 From: Bruce Ashfield When building against a v5.19 mips kernel, the following errors were triggered: | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:105:42: note: expected 'struct compact_control *' but argument is of type 'struct compact_control *' | 105 | TP_PROTO(struct compact_control *cc, | | ~~~~~~~~~~~~~~~~~~~~~~~~^~ | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:779:68: note: in definition of macro 'LTTNG_TRACEPOINT_EVENT_CLASS_CODE' | 779 | static inline size_t __event_get_align__##_name(void *__tp_locvar, _proto) \ | | ^~~~~~ | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:106:50: note: in expansion of macro 'PARAMS' | 106 | LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, PARAMS(_proto), PARAMS(_args), , , \ | | ^~~~~~ | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:41:9: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_CLASS' | 41 | LTTNG_TRACEPOINT_EVENT_CLASS(map, \ | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:42:30: note: in expansion of macro 'PARAMS' | 42 | PARAMS(proto), \ | | ^~~~~~ | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:101:1: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' | 101 | LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:105:9: note: in expansion of macro 'TP_PROTO' | 105 | TP_PROTO(struct compact_control *cc, | | ^~~~~~~~ | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:112:57: error: invalid use of undefined type 'struct compact_control' ... | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:108:25: warning: 'struct compact_control' declared inside parameter list will not be visible outside of this definition or declaration | 108 | TP_PROTO(struct compact_control *cc, | | ^~~~~~~~~~~~~~~ | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:159:43: note: in definition of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' | 159 | void __event_template_proto___##_template(_proto); | | ^~~~~~ | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:45:61: note: in expansion of macro 'PARAMS' | 45 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args)) | | ^~~~~~ | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:104:1: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' | 104 | LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:108:9: note: in expansion of macro 'TP_PROTO' | 108 | TP_PROTO(struct compact_control *cc, | | ^~~~~~~~ | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:159:6: error: conflicting types for '__event_template_proto___compaction_migratepages'; have 'void(struct compact_control *, unsigned int)' | 159 | void __event_template_proto___##_template(_proto); | | ^~~~~~~~~~~~~~~~~~~~~~~~~ | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:45:9: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' | 45 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args)) | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ The root cause appears to be that this particular mips kernel does not have CONFIG_COMPACTION avaiable, and hence we end up with the struct declaration within this tracepoint, and then conflicting types. While putting the conditional around only compaction_migratepages seemed sufficient to get the build working, it doesn't look like any of the tracepoints should be valid, so we extend it to all definitions. Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2022-August/030246.html] (From OE-Core rev: e25f7b5ca83d3f025ef2235f2ebd8233013eb406) Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie Signed-off-by: Naveen Saini Signed-off-by: Steve Sakoman --- ...tracepoints-condtional-on-CONFIG_COM.patch | 103 ++++++++++++++++++ .../lttng/lttng-modules_2.13.4.bb | 1 + 2 files changed, 104 insertions(+) create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-compaction-make-tracepoints-condtional-on-CONFIG_COM.patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-compaction-make-tracepoints-condtional-on-CONFIG_COM.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-compaction-make-tracepoints-condtional-on-CONFIG_COM.patch new file mode 100644 index 0000000000..305ca7cb8b --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-compaction-make-tracepoints-condtional-on-CONFIG_COM.patch @@ -0,0 +1,103 @@ +From 417bb00022c813c6dc11bfa652d74f3687df7626 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield +Date: Wed, 3 Aug 2022 14:55:56 -0400 +Subject: [PATCH] compaction: make tracepoints condtional on CONFIG_COMPACTION + +When building against a v5.19 mips kernel, the following errors +were triggered: + + | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:105:42: note: expected 'struct compact_control *' but argument is of type 'struct compact_control *' + | 105 | TP_PROTO(struct compact_control *cc, + | | ~~~~~~~~~~~~~~~~~~~~~~~~^~ + | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:779:68: note: in definition of macro 'LTTNG_TRACEPOINT_EVENT_CLASS_CODE' + | 779 | static inline size_t __event_get_align__##_name(void *__tp_locvar, _proto) \ + | | ^~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:106:50: note: in expansion of macro 'PARAMS' + | 106 | LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, PARAMS(_proto), PARAMS(_args), , , \ + | | ^~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:41:9: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_CLASS' + | 41 | LTTNG_TRACEPOINT_EVENT_CLASS(map, \ + | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:42:30: note: in expansion of macro 'PARAMS' + | 42 | PARAMS(proto), \ + | | ^~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:101:1: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' + | 101 | LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, + | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:105:9: note: in expansion of macro 'TP_PROTO' + | 105 | TP_PROTO(struct compact_control *cc, + | | ^~~~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:112:57: error: invalid use of undefined type 'struct compact_control' + +... + + | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:108:25: warning: 'struct compact_control' declared inside parameter list will not be visible outside of this definition or declaration + | 108 | TP_PROTO(struct compact_control *cc, + | | ^~~~~~~~~~~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:159:43: note: in definition of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' + | 159 | void __event_template_proto___##_template(_proto); + | | ^~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:45:61: note: in expansion of macro 'PARAMS' + | 45 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args)) + | | ^~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:104:1: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' + | 104 | LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, + | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:108:9: note: in expansion of macro 'TP_PROTO' + | 108 | TP_PROTO(struct compact_control *cc, + | | ^~~~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:159:6: error: conflicting types for '__event_template_proto___compaction_migratepages'; have 'void(struct compact_control *, unsigned int)' + | 159 | void __event_template_proto___##_template(_proto); + | | ^~~~~~~~~~~~~~~~~~~~~~~~~ + | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:45:9: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' + | 45 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args)) + | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The root cause appears to be that this particular mips kernel does not +have CONFIG_COMPACTION avaiable, and hence we end up with the struct +declaration within this tracepoint, and then conflicting types. + +While putting the conditional around only compaction_migratepages seemed +sufficient to get the build working, it doesn't look like any of the +tracepoints should be valid, so we extend it to all definitions. + +Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2022-August/030246.html] + +Signed-off-by: Bruce Ashfield +--- + include/instrumentation/events/compaction.h | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/include/instrumentation/events/compaction.h b/include/instrumentation/events/compaction.h +index ecae39a..155804a 100644 +--- a/include/instrumentation/events/compaction.h ++++ b/include/instrumentation/events/compaction.h +@@ -9,6 +9,8 @@ + #include + #include + ++#ifdef CONFIG_COMPACTION ++ + #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) + + LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template, +@@ -97,6 +99,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template, + + #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */ + ++ + #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) + LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, + +@@ -182,6 +185,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, + ) + #endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,16,0)) */ + ++#endif /* CONFIG_COMPACTION */ ++ + #endif /* LTTNG_TRACE_COMPACTION_H */ + + /* This part must be outside protection */ +-- +2.25.1 + diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb index fea0e383c9..a81a0e580f 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb @@ -15,6 +15,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch \ file://0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch \ file://0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch \ + file://0001-compaction-make-tracepoints-condtional-on-CONFIG_COM.patch \ " # Use :append here so that the patch is applied also when using devupstream From patchwork Fri Aug 19 02:42:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 11590 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 7A0A9C3F6B0 for ; Fri, 19 Aug 2022 02:44:05 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web08.50688.1660877043895786939 for ; Thu, 18 Aug 2022 19:44:04 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=PYMcWvFf; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id h28so3163777pfq.11 for ; Thu, 18 Aug 2022 19:44:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=58dZJpajNF3InL8laB0DuuK433rhBKRv2Rtvrmld8aI=; b=PYMcWvFfMuSywWNLMi5C/PRUVJtY3X4g5rCjDbtu3CCsWaCPETtL2xDXkaVTLbEeJx OVI6mfv9DndowHje+GiqJySM1y+wgc7t0otRjqOncfUgn+jGPd8RORRGgAwzFciryzLn zvx3Qyj5fgyjoTGZRwDlE7Yzog7ymgZTm810iNs55DdMY2xNAxYCCM3HGIVHmWeqZ7gQ XJn+4WFqWymWK3L0S/PYVIbuBwWKNoFEtJ9dDQcSuq+zX/sCshLfDrRc57y41Rx5P+ty UH/IvDBMBUc1qvp7E9kFfYwYcuE+OfTQTaOlbHCsifYwJbifA0qJWkgR1eBcCirhji8X Sqtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=58dZJpajNF3InL8laB0DuuK433rhBKRv2Rtvrmld8aI=; b=a7tOZYC+Wk3K7KnLPlCfC3kyuCgRLQHG7u90LTEfxDAtkDLpxmJyhKoD1/cAKG8vnS o49SVguSAAxltUHQaH5FXIz+hE3MaGELwNsuW5b8TDU5TbF77dTCFDBNrA4Fq5+JTQ0N 1Ez+pF67fI0oVa/VQO+P8mOUqJEfZLuraJewhJEI7E6fCs7m1EjXakh9RNYv/YbTKD5m wrAEBc9afdQY0hRmt1ikzjDOONAmzIM1hWORAebjHDM5PFPHOxEQCT0bkP4KxS7RVEmk x7l/FruY/5LZUEL9rfjHaXnyWUfJHC90a1iK4C1N+E6BcS1fb+6FBoMx/VixddlKCmHk 3Cbg== X-Gm-Message-State: ACgBeo0opLU5Uws3iJLpn2NLb7GSPuwLdPzCyqtsMff01NpF9smBEr7V PF5ThaHXAonXaXJ23yhXLYY5e7nwb/Uen2rP X-Google-Smtp-Source: AA6agR6B9SrxJPhsItOUgmzlPBFnO2ZrHbXNsYvcxRIKPTfaS7P4qJoPHvRWC+d6NfM0ig/stELuSA== X-Received: by 2002:a05:6a00:32ca:b0:535:e7e4:dfb3 with SMTP id cl10-20020a056a0032ca00b00535e7e4dfb3mr4035124pfb.6.1660877042787; Thu, 18 Aug 2022 19:44:02 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id t12-20020a17090a4e4c00b001fa80cde150sm4150145pjl.20.2022.08.18.19.44.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 19:44:02 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 26/26] lttng-modules: replace mips compaction fix with upstream change Date: Thu, 18 Aug 2022 16:42:48 -1000 Message-Id: <10891d4d955f347c328cf8c099031f05f5c855a2.1660876844.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: 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 ; Fri, 19 Aug 2022 02:44:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169569 From: Bruce Ashfield lttng upstream had a different solution to the compaction build isses seen on mips. We switch our patch for a backport of the upstream solution. (From OE-Core rev: 459f746a198a8ae7840d783f5824fc14a44a8488) Signed-off-by: Bruce Ashfield Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie Signed-off-by: Naveen Saini Signed-off-by: Steve Sakoman --- ...tracepoints-condtional-on-CONFIG_COM.patch | 103 ------------------ .../lttng-modules/0001-fix-compaction.patch | 68 ++++++++++++ .../lttng/lttng-modules_2.13.4.bb | 2 +- 3 files changed, 69 insertions(+), 104 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-compaction-make-tracepoints-condtional-on-CONFIG_COM.patch create mode 100644 meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-compaction-make-tracepoints-condtional-on-CONFIG_COM.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-compaction-make-tracepoints-condtional-on-CONFIG_COM.patch deleted file mode 100644 index 305ca7cb8b..0000000000 --- a/meta/recipes-kernel/lttng/lttng-modules/0001-compaction-make-tracepoints-condtional-on-CONFIG_COM.patch +++ /dev/null @@ -1,103 +0,0 @@ -From 417bb00022c813c6dc11bfa652d74f3687df7626 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield -Date: Wed, 3 Aug 2022 14:55:56 -0400 -Subject: [PATCH] compaction: make tracepoints condtional on CONFIG_COMPACTION - -When building against a v5.19 mips kernel, the following errors -were triggered: - - | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:105:42: note: expected 'struct compact_control *' but argument is of type 'struct compact_control *' - | 105 | TP_PROTO(struct compact_control *cc, - | | ~~~~~~~~~~~~~~~~~~~~~~~~^~ - | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:779:68: note: in definition of macro 'LTTNG_TRACEPOINT_EVENT_CLASS_CODE' - | 779 | static inline size_t __event_get_align__##_name(void *__tp_locvar, _proto) \ - | | ^~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:106:50: note: in expansion of macro 'PARAMS' - | 106 | LTTNG_TRACEPOINT_EVENT_CLASS_CODE(_name, PARAMS(_proto), PARAMS(_args), , , \ - | | ^~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:41:9: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_CLASS' - | 41 | LTTNG_TRACEPOINT_EVENT_CLASS(map, \ - | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:42:30: note: in expansion of macro 'PARAMS' - | 42 | PARAMS(proto), \ - | | ^~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:101:1: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' - | 101 | LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, - | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:105:9: note: in expansion of macro 'TP_PROTO' - | 105 | TP_PROTO(struct compact_control *cc, - | | ^~~~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:112:57: error: invalid use of undefined type 'struct compact_control' - -... - - | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:108:25: warning: 'struct compact_control' declared inside parameter list will not be visible outside of this definition or declaration - | 108 | TP_PROTO(struct compact_control *cc, - | | ^~~~~~~~~~~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:159:43: note: in definition of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' - | 159 | void __event_template_proto___##_template(_proto); - | | ^~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:45:61: note: in expansion of macro 'PARAMS' - | 45 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args)) - | | ^~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:104:1: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_MAP' - | 104 | LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, - | | ^~~~~~~~~~~~~~~~~~~~~~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/instrumentation/events/compaction.h:108:9: note: in expansion of macro 'TP_PROTO' - | 108 | TP_PROTO(struct compact_control *cc, - | | ^~~~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:159:6: error: conflicting types for '__event_template_proto___compaction_migratepages'; have 'void(struct compact_control *, unsigned int)' - | 159 | void __event_template_proto___##_template(_proto); - | | ^~~~~~~~~~~~~~~~~~~~~~~~~ - | lttng-modules-2.13.4/src/probes/../../include/lttng/tracepoint-event-impl.h:45:9: note: in expansion of macro 'LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP' - | 45 | LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(map, name, map, PARAMS(proto), PARAMS(args)) - | | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The root cause appears to be that this particular mips kernel does not -have CONFIG_COMPACTION avaiable, and hence we end up with the struct -declaration within this tracepoint, and then conflicting types. - -While putting the conditional around only compaction_migratepages seemed -sufficient to get the build working, it doesn't look like any of the -tracepoints should be valid, so we extend it to all definitions. - -Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2022-August/030246.html] - -Signed-off-by: Bruce Ashfield ---- - include/instrumentation/events/compaction.h | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/include/instrumentation/events/compaction.h b/include/instrumentation/events/compaction.h -index ecae39a..155804a 100644 ---- a/include/instrumentation/events/compaction.h -+++ b/include/instrumentation/events/compaction.h -@@ -9,6 +9,8 @@ - #include - #include - -+#ifdef CONFIG_COMPACTION -+ - #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) - - LTTNG_TRACEPOINT_EVENT_CLASS(compaction_isolate_template, -@@ -97,6 +99,7 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE_MAP(compaction_isolate_template, - - #endif /* #else #if LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(4,0,0) */ - -+ - #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,18,0)) - LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, - -@@ -182,6 +185,8 @@ LTTNG_TRACEPOINT_EVENT_MAP(mm_compaction_migratepages, - ) - #endif /* #else #if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(3,16,0)) */ - -+#endif /* CONFIG_COMPACTION */ -+ - #endif /* LTTNG_TRACE_COMPACTION_H */ - - /* This part must be outside protection */ --- -2.25.1 - diff --git a/meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch new file mode 100644 index 0000000000..21e27ffc5e --- /dev/null +++ b/meta/recipes-kernel/lttng/lttng-modules/0001-fix-compaction.patch @@ -0,0 +1,68 @@ +From 8e42c4821fb5f5cb816b6ddf73d9a13ba3298a63 Mon Sep 17 00:00:00 2001 +From: Michael Jeanson +Date: Wed, 10 Aug 2022 11:07:14 -0400 +Subject: [PATCH] fix: tie compaction probe build to CONFIG_COMPACTION + +The definition of 'struct compact_control' in 'mm/internal.h' depends on +CONFIG_COMPACTION being defined. Only build the compaction probe when +this configuration option is enabled. + +Thanks to Bruce Ashfield for reporting this +issue. + +Upstream-Status: Backport [https://review.lttng.org/c/lttng-modules/+/8660] + +Change-Id: I81e77aa9c1bf10452c152d432fe5224df0db42c9 +Signed-off-by: Michael Jeanson +--- + src/probes/Kbuild | 34 ++++++++++++++++++---------------- + 1 file changed, 18 insertions(+), 16 deletions(-) + +diff --git a/src/probes/Kbuild b/src/probes/Kbuild +index 2908cf75..3e556b8e 100644 +--- a/src/probes/Kbuild ++++ b/src/probes/Kbuild +@@ -167,22 +167,24 @@ ifneq ($(CONFIG_BTRFS_FS),) + endif # $(wildcard $(btrfs_dep)) + endif # CONFIG_BTRFS_FS + +-# A dependency on internal header 'mm/internal.h' was introduced in v5.18 +-compaction_dep = $(srctree)/mm/internal.h +-compaction_dep_wildcard = $(wildcard $(compaction_dep)) +-compaction_dep_check = $(shell \ +-if [ \( $(VERSION) -ge 6 \ +- -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \ +- -z "$(compaction_dep_wildcard)" ] ; then \ +- echo "warn" ; \ +-else \ +- echo "ok" ; \ +-fi ;) +-ifeq ($(compaction_dep_check),ok) +- obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o +-else +- $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.) +-endif # $(wildcard $(compaction_dep)) ++ifneq ($(CONFIG_COMPACTION),) ++ # A dependency on internal header 'mm/internal.h' was introduced in v5.18 ++ compaction_dep = $(srctree)/mm/internal.h ++ compaction_dep_wildcard = $(wildcard $(compaction_dep)) ++ compaction_dep_check = $(shell \ ++ if [ \( $(VERSION) -ge 6 \ ++ -o \( $(VERSION) -eq 5 -a $(PATCHLEVEL) -ge 18 \) \) -a \ ++ -z "$(compaction_dep_wildcard)" ] ; then \ ++ echo "warn" ; \ ++ else \ ++ echo "ok" ; \ ++ fi ;) ++ ifeq ($(compaction_dep_check),ok) ++ obj-$(CONFIG_LTTNG) += lttng-probe-compaction.o ++ else ++ $(warning Files $(compaction_dep) not found. Probe "compaction" is disabled. Use full kernel source tree to enable it.) ++ endif # $(wildcard $(compaction_dep)) ++endif # CONFIG_COMPACTION + + ifneq ($(CONFIG_EXT4_FS),) + ext4_dep = $(srctree)/fs/ext4/*.h +-- +2.34.1 + diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb index a81a0e580f..f60ab3b5f5 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.13.4.bb @@ -15,7 +15,7 @@ SRC_URI = "https://lttng.org/files/${BPN}/${BPN}-${PV}.tar.bz2 \ file://0002-fix-fs-Remove-flags-parameter-from-aops-write_begin-.patch \ file://0003-fix-workqueue-Fix-type-of-cpu-in-trace-event-v5.19.patch \ file://0001-fix-net-skb-introduce-kfree_skb_reason-v5.15.58.v5.1.patch \ - file://0001-compaction-make-tracepoints-condtional-on-CONFIG_COM.patch \ + file://0001-fix-compaction.patch \ " # Use :append here so that the patch is applied also when using devupstream