From patchwork Fri Oct 20 15:51:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32661 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 720EACDB474 for ; Fri, 20 Oct 2023 15:51:39 +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.57857.1697817095439987829 for ; Fri, 20 Oct 2023 08:51:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=YgaNvTgp; spf=softfail (domain: sakoman.com, ip: 209.85.214.181, mailfrom: steve@sakoman.com) Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1c9e06f058bso16053255ad.0 for ; Fri, 20 Oct 2023 08:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817094; x=1698421894; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=H+W4JhMFZW2E0xdHdsXpdPk4MYX7Vn4+HZG+CrTp+E8=; b=YgaNvTgpk/gi4ZmxCv4Z5rGbywWajLO8W6a0H8vyaB2Qw27Z8kZteJuZluYhP4FG6i GWIifyy4B+NdnFvzlQq2CfQWefx+f23nDNGdtn+/OL3UhrRG3C5L7qYe25EoKLfpG6Sk /fVrG6oorPf1XXW26d2/M3IXHMV6/rA1namBCY0Pl3ON+yeU0Qz+y4MWIpzAPuCjcvp0 JR/fcL83Fod3LzJCtPo/5ZSkbKM5a4ZXwZ9edXAyRwCMveHH+An55FHOvpDL41ZxEyTQ ctlHq46BNsyY0oKj+ZJL2RL+xaY+srJyHWc0KsLpyNX03Ba8ngDoIXyXtr/aUTQ7zqU/ X+Jw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817094; x=1698421894; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=H+W4JhMFZW2E0xdHdsXpdPk4MYX7Vn4+HZG+CrTp+E8=; b=D+B77D1jFIAX+G62dtf2zBNMoL5Ad/KiJ+U3RMqmiTVksPsOiDA53YlBlYvN20tCTG 8/Bg5kLcoAjA4TaNJmksjXFa8xmgq1Tqhmld5qytWxgOcihmAm79hEbNut2jPvjYoD5Z wP7nz3u7eLmbPDPmqJcVA8SW/Kma8OPHQOAOQl+bkHmVrUrK0q9gQF/08wiZ4yfI38em nJwmSHtaPzCSLajceLVcYJCxspene0xucsv3h8dJkI4dmVBY0zDFpfKpMXILPBrSJi6P chfXRZap+NY4rhJrFJoSUEmTVBTzkbHG0ketXPhk6UoQRp6ZbUjGVDEGrHs6u7zuoRr6 XcWg== X-Gm-Message-State: AOJu0Yy3z1L/UKTN19gyhUfvuta8OyRr4X0wgh8PS/aWmtakQE8/aWgy y3urp5d+GPUR5nmyRQhQf5mJiaWmLIIKNv/nDyg= X-Google-Smtp-Source: AGHT+IFZgPWPBaqfRgQVqtcgZpbpMaIz0OHZilBP3A9rWmKrMobMyAGM7Lxl98OvQy1A7buVRhaIjw== X-Received: by 2002:a17:902:cec6:b0:1bd:d510:78fb with SMTP id d6-20020a170902cec600b001bdd51078fbmr8233441plg.3.1697817094484; Fri, 20 Oct 2023 08:51:34 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 01/24] cups: fix CVE-2023-4504 Date: Fri, 20 Oct 2023 05:51:03 -1000 Message-Id: X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189546 From: Lee Chee Yang Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- meta/recipes-extended/cups/cups.inc | 1 + .../cups/cups/CVE-2023-4504.patch | 42 +++++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 meta/recipes-extended/cups/cups/CVE-2023-4504.patch diff --git a/meta/recipes-extended/cups/cups.inc b/meta/recipes-extended/cups/cups.inc index c6a676b747..d09ceb203f 100644 --- a/meta/recipes-extended/cups/cups.inc +++ b/meta/recipes-extended/cups/cups.inc @@ -17,6 +17,7 @@ SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/cups-${PV}-source.tar.gz \ file://cups-volatiles.conf \ file://CVE-2023-32324.patch \ file://CVE-2023-34241.patch \ + file://CVE-2023-4504.patch \ " GITHUB_BASE_URI = "https://github.com/OpenPrinting/cups/releases" diff --git a/meta/recipes-extended/cups/cups/CVE-2023-4504.patch b/meta/recipes-extended/cups/cups/CVE-2023-4504.patch new file mode 100644 index 0000000000..e52e43a209 --- /dev/null +++ b/meta/recipes-extended/cups/cups/CVE-2023-4504.patch @@ -0,0 +1,42 @@ +CVE: CVE-2023-4504 +Upstream-Status: Backport [https://github.com/OpenPrinting/cups/commit/2431caddb7e6a87f04ac90b5c6366ad268b6ff31 ] +Signed-off-by: Lee Chee Yang + +From 2431caddb7e6a87f04ac90b5c6366ad268b6ff31 Mon Sep 17 00:00:00 2001 +From: Zdenek Dohnal +Date: Wed, 20 Sep 2023 14:45:17 +0200 +Subject: [PATCH] raster-interpret.c: Fix CVE-2023-4504 + +We didn't check for end of buffer if it looks there is an escaped +character - check for NULL terminator there and if found, return NULL +as return value and in `ptr`, because a lone backslash is not +a valid PostScript character. +--- + cups/raster-interpret.c | 14 +++++++++++++- + 1 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/cups/raster-interpret.c b/cups/raster-interpret.c +index 6fcf731b5..b8655c8c6 100644 +--- a/cups/raster-interpret.c ++++ b/cups/raster-interpret.c +@@ -1116,7 +1116,19 @@ scan_ps(_cups_ps_stack_t *st, /* I - Stack */ + + cur ++; + +- if (*cur == 'b') ++ /* ++ * Return NULL if we reached NULL terminator, a lone backslash ++ * is not a valid character in PostScript. ++ */ ++ ++ if (!*cur) ++ { ++ *ptr = NULL; ++ ++ return (NULL); ++ } ++ ++ if (*cur == 'b') + *valptr++ = '\b'; + else if (*cur == 'f') + *valptr++ = '\f'; From patchwork Fri Oct 20 15:51:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32663 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 8B8FAC0032E for ; Fri, 20 Oct 2023 15:51:39 +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.web10.57858.1697817097834269256 for ; Fri, 20 Oct 2023 08:51:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=zi5NlnTq; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1c9b7c234a7so7834085ad.3 for ; Fri, 20 Oct 2023 08:51:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817097; x=1698421897; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=8N6KzJVzAmgk+uMEup/LiO9dB+G1gwAQmdr4z92ijU8=; b=zi5NlnTqmUpaDjFnNL3DHhKBcQDtGtHBOPKvIa0vJ4Ooohh8KnW9yAjnd7P0dHMlsy zuVd6IbOL+r5UxZFxgYSYASUnmvAIFvpEM9LkWyiAMo/fZNEZJj9QkaoLJXc3yk4xfzr /o7h96OXGkkai2pj8bQ50XVSkXFmrqIeN4/7E99tzTNPxFjSVOkdyMzFkmlbABvEtydl 8SOLBR9yD3h6+psikO/JzmoeGMpvWkUyaWO48b4waI/tcbdMeHOpcCZ327qioRopaqdX Xq2ZhhecDtsl6oFJamwt/qY3zt4ExDnTQAsNFREabq0jdPxxuaVot+GG8Uoxho2JHeCu jjPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817097; x=1698421897; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=8N6KzJVzAmgk+uMEup/LiO9dB+G1gwAQmdr4z92ijU8=; b=ItTVQ3YJHqpv57HyUZ/fLJaI0v7qyNPS8WLiUBQDPpV+7FLpU40nqzGWykHaRrU24T Us8PSZ5qPXiZmrs2HNwnJjiypqJZF14/fo7f6L96AN8X0WeOSK2d3I5i4+gjfnGnhtez wX6Y1zLDEdLIL6DMhvX3uM9kUN+Ulshc7bFW5xx45v11ct7QVRoEauqAgUR8JKQGjV0+ yXvs9KRBbWBcSoZs/U9ImtS6F1bLt2QxzamKjpO1e9XnsWsxtpqRaQ3JIbWcaKa4HOxP sbU5/32cDVUVIVNRWxLu3APiP2+JAA3UQThc5mFmhSD0WANKMhDSwJTV8dmDViYYz8pB o2CA== X-Gm-Message-State: AOJu0YxVk/k1Uh0Nw01ofpkSG1JY1IOHw22zagjc8+7fRWa7ew0ezzrp v4tvxRFTcHu7xsSlcp0Xj7nFb9JMh4Y3psEfKog= X-Google-Smtp-Source: AGHT+IGvtyed7rLGtGHU/g3J3GTTuZ3aLIWFHGOS0fiqc+BTqlMeDRA+J6hoQsRNwAUh+L2YaXmx/w== X-Received: by 2002:a17:903:110c:b0:1c6:a0b:7b9a with SMTP id n12-20020a170903110c00b001c60a0b7b9amr2650913plh.3.1697817096417; Fri, 20 Oct 2023 08:51:36 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 02/24] dmidecode: fixup for CVE-2023-30630 Date: Fri, 20 Oct 2023 05:51:04 -1000 Message-Id: <0bc69dc078c39381a39789d3c5fff673d7da994c.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189547 From: Sean Nyekjaer The previous CVE-2023-30630_1.patch picked only the patch "dmidecode: Write the whole dump file at once" d8cfbc808f. But there was a refactoring which does not allow to cherry-pick it fast forward. Resolving this conflict was not correctly done. The patch was: + u32 len; + u8 *table; ... - if (!(opt.flags & FLAG_QUIET)) - pr_comment("Writing %d bytes to %s.", crafted[0x05], - opt.dumpfile); - write_dump(0, crafted[0x05], crafted, opt.dumpfile, 1); + dmi_table_dump(crafted, crafted[0x05], table, len); It looks like the variables len and table have been added without initialization. Now this problem is solved by applying the previous refactoring as well. Patch 1 gets replaced by Patch 1a and Patch 1b. Patch 2..4 are rebased without changes. This is basically the same patch as in kirkstone: ea069a94a2 dmidecode: fixup for CVE-2023-30630 Signed-off-by: Sean Nyekjaer Signed-off-by: Steve Sakoman --- .../dmidecode/CVE-2023-30630_1a.patch | 236 ++++++++++++++++++ .../dmidecode/CVE-2023-30630_1b.patch | 197 +++++++++++++++ .../dmidecode/CVE-2023-30630_2.patch | 8 +- .../dmidecode/CVE-2023-30630_3.patch | 55 ++-- .../dmidecode/CVE-2023-30630_4.patch | 143 +++++------ .../dmidecode/dmidecode_3.4.bb | 3 +- 6 files changed, 539 insertions(+), 103 deletions(-) create mode 100644 meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_1a.patch create mode 100644 meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_1b.patch diff --git a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_1a.patch b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_1a.patch new file mode 100644 index 0000000000..bf93fbc13c --- /dev/null +++ b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_1a.patch @@ -0,0 +1,236 @@ +From ee6db10dd70b8fdc7a93cffd7cf5bc7a28f9d3d7 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Mon, 20 Feb 2023 14:53:21 +0100 +Subject: [PATCH 1/5] dmidecode: Split table fetching from decoding + +Clean up function dmi_table so that it does only one thing: +* dmi_table() is renamed to dmi_table_get(). It now retrieves the + DMI table, but does not process it any longer. +* Decoding or dumping the table is now done in smbios3_decode(), + smbios_decode() and legacy_decode(). +No functional change. + +A side effect of this change is that writing the header and body of +dump files is now done in a single location. This is required to +further consolidate the writing of dump files. + +Signed-off-by: Jean Delvare +Reviewed-by: Jerry Hoemann + +CVE: CVE-2023-30630 + +Upstream-Status: Backport [https://git.savannah.nongnu.org/cgit/dmidecode.git/commit/?id=39b2dd7b6ab719b920e96ed832cfb4bdd664e808] + +Signed-off-by: Adrian Freihofer +--- + dmidecode.c | 86 ++++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 62 insertions(+), 24 deletions(-) + +diff --git a/dmidecode.c b/dmidecode.c +index cd2b5c9..b082c03 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -5247,8 +5247,9 @@ static void dmi_table_decode(u8 *buf, u32 len, u16 num, u16 ver, u32 flags) + } + } + +-static void dmi_table(off_t base, u32 len, u16 num, u32 ver, const char *devmem, +- u32 flags) ++/* Allocates a buffer for the table, must be freed by the caller */ ++static u8 *dmi_table_get(off_t base, u32 *len, u16 num, u32 ver, ++ const char *devmem, u32 flags) + { + u8 *buf; + +@@ -5267,7 +5268,7 @@ static void dmi_table(off_t base, u32 len, u16 num, u32 ver, const char *devmem, + { + if (num) + pr_info("%u structures occupying %u bytes.", +- num, len); ++ num, *len); + if (!(opt.flags & FLAG_FROM_DUMP)) + pr_info("Table at 0x%08llX.", + (unsigned long long)base); +@@ -5285,19 +5286,19 @@ static void dmi_table(off_t base, u32 len, u16 num, u32 ver, const char *devmem, + * would be the result of the kernel truncating the table on + * parse error. + */ +- size_t size = len; ++ size_t size = *len; + buf = read_file(flags & FLAG_NO_FILE_OFFSET ? 0 : base, + &size, devmem); +- if (!(opt.flags & FLAG_QUIET) && num && size != (size_t)len) ++ if (!(opt.flags & FLAG_QUIET) && num && size != (size_t)*len) + { + fprintf(stderr, "Wrong DMI structures length: %u bytes " + "announced, only %lu bytes available.\n", +- len, (unsigned long)size); ++ *len, (unsigned long)size); + } +- len = size; ++ *len = size; + } + else +- buf = mem_chunk(base, len, devmem); ++ buf = mem_chunk(base, *len, devmem); + + if (buf == NULL) + { +@@ -5307,15 +5308,9 @@ static void dmi_table(off_t base, u32 len, u16 num, u32 ver, const char *devmem, + fprintf(stderr, + "Try compiling dmidecode with -DUSE_MMAP.\n"); + #endif +- return; + } + +- if (opt.flags & FLAG_DUMP_BIN) +- dmi_table_dump(buf, len); +- else +- dmi_table_decode(buf, len, num, ver >> 8, flags); +- +- free(buf); ++ return buf; + } + + +@@ -5350,8 +5345,9 @@ static void overwrite_smbios3_address(u8 *buf) + + static int smbios3_decode(u8 *buf, const char *devmem, u32 flags) + { +- u32 ver; ++ u32 ver, len; + u64 offset; ++ u8 *table; + + /* Don't let checksum run beyond the buffer */ + if (buf[0x06] > 0x20) +@@ -5377,8 +5373,12 @@ static int smbios3_decode(u8 *buf, const char *devmem, u32 flags) + return 0; + } + +- dmi_table(((off_t)offset.h << 32) | offset.l, +- DWORD(buf + 0x0C), 0, ver, devmem, flags | FLAG_STOP_AT_EOT); ++ /* Maximum length, may get trimmed */ ++ len = DWORD(buf + 0x0C); ++ table = dmi_table_get(((off_t)offset.h << 32) | offset.l, &len, 0, ver, ++ devmem, flags | FLAG_STOP_AT_EOT); ++ if (table == NULL) ++ return 1; + + if (opt.flags & FLAG_DUMP_BIN) + { +@@ -5387,18 +5387,28 @@ static int smbios3_decode(u8 *buf, const char *devmem, u32 flags) + memcpy(crafted, buf, 32); + overwrite_smbios3_address(crafted); + ++ dmi_table_dump(table, len); + if (!(opt.flags & FLAG_QUIET)) + pr_comment("Writing %d bytes to %s.", crafted[0x06], + opt.dumpfile); + write_dump(0, crafted[0x06], crafted, opt.dumpfile, 1); + } ++ else ++ { ++ dmi_table_decode(table, len, 0, ver >> 8, ++ flags | FLAG_STOP_AT_EOT); ++ } ++ ++ free(table); + + return 1; + } + + static int smbios_decode(u8 *buf, const char *devmem, u32 flags) + { +- u16 ver; ++ u16 ver, num; ++ u32 len; ++ u8 *table; + + /* Don't let checksum run beyond the buffer */ + if (buf[0x05] > 0x20) +@@ -5438,8 +5448,13 @@ static int smbios_decode(u8 *buf, const char *devmem, u32 flags) + pr_info("SMBIOS %u.%u present.", + ver >> 8, ver & 0xFF); + +- dmi_table(DWORD(buf + 0x18), WORD(buf + 0x16), WORD(buf + 0x1C), +- ver << 8, devmem, flags); ++ /* Maximum length, may get trimmed */ ++ len = WORD(buf + 0x16); ++ num = WORD(buf + 0x1C); ++ table = dmi_table_get(DWORD(buf + 0x18), &len, num, ver << 8, ++ devmem, flags); ++ if (table == NULL) ++ return 1; + + if (opt.flags & FLAG_DUMP_BIN) + { +@@ -5448,27 +5463,43 @@ static int smbios_decode(u8 *buf, const char *devmem, u32 flags) + memcpy(crafted, buf, 32); + overwrite_dmi_address(crafted + 0x10); + ++ dmi_table_dump(table, len); + if (!(opt.flags & FLAG_QUIET)) + pr_comment("Writing %d bytes to %s.", crafted[0x05], + opt.dumpfile); + write_dump(0, crafted[0x05], crafted, opt.dumpfile, 1); + } ++ else ++ { ++ dmi_table_decode(table, len, num, ver, flags); ++ } ++ ++ free(table); + + return 1; + } + + static int legacy_decode(u8 *buf, const char *devmem, u32 flags) + { ++ u16 ver, num; ++ u32 len; ++ u8 *table; ++ + if (!checksum(buf, 0x0F)) + return 0; + ++ ver = ((buf[0x0E] & 0xF0) << 4) + (buf[0x0E] & 0x0F); + if (!(opt.flags & FLAG_QUIET)) + pr_info("Legacy DMI %u.%u present.", + buf[0x0E] >> 4, buf[0x0E] & 0x0F); + +- dmi_table(DWORD(buf + 0x08), WORD(buf + 0x06), WORD(buf + 0x0C), +- ((buf[0x0E] & 0xF0) << 12) + ((buf[0x0E] & 0x0F) << 8), +- devmem, flags); ++ /* Maximum length, may get trimmed */ ++ len = WORD(buf + 0x06); ++ num = WORD(buf + 0x0C); ++ table = dmi_table_get(DWORD(buf + 0x08), &len, num, ver << 8, ++ devmem, flags); ++ if (table == NULL) ++ return 1; + + if (opt.flags & FLAG_DUMP_BIN) + { +@@ -5477,11 +5508,18 @@ static int legacy_decode(u8 *buf, const char *devmem, u32 flags) + memcpy(crafted, buf, 16); + overwrite_dmi_address(crafted); + ++ dmi_table_dump(table, len); + if (!(opt.flags & FLAG_QUIET)) + pr_comment("Writing %d bytes to %s.", 0x0F, + opt.dumpfile); + write_dump(0, 0x0F, crafted, opt.dumpfile, 1); + } ++ else ++ { ++ dmi_table_decode(table, len, num, ver, flags); ++ } ++ ++ free(table); + + return 1; + } +-- +2.41.0 + diff --git a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_1b.patch b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_1b.patch new file mode 100644 index 0000000000..e03bda05e4 --- /dev/null +++ b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_1b.patch @@ -0,0 +1,197 @@ +From d362549bce92ac22860cda8cad4532c1a3fe6928 Mon Sep 17 00:00:00 2001 +From: Jean Delvare +Date: Mon, 20 Feb 2023 14:53:25 +0100 +Subject: [PATCH 2/5] dmidecode: Write the whole dump file at once + +When option --dump-bin is used, write the whole dump file at once, +instead of opening and closing the file separately for the table +and then for the entry point. + +As the file writing function is no longer generic, it gets moved +from util.c to dmidecode.c. + +One minor functional change resulting from the new implementation is +that the entry point is written first now, so the messages printed +are swapped. + +Signed-off-by: Jean Delvare +Reviewed-by: Jerry Hoemann + +CVE: CVE-2023-30630 + +Upstream-Status: Backport [https://git.savannah.nongnu.org/cgit/dmidecode.git/commit/?id=d8cfbc808f387e87091c25e7d5b8c2bb348bb206] + +Signed-off-by: Adrian Freihofer +--- + dmidecode.c | 69 +++++++++++++++++++++++++++++++++++++++-------------- + util.c | 40 ------------------------------- + util.h | 1 - + 3 files changed, 51 insertions(+), 59 deletions(-) + +diff --git a/dmidecode.c b/dmidecode.c +index b082c03..a80a140 100644 +--- a/dmidecode.c ++++ b/dmidecode.c +@@ -5130,11 +5130,56 @@ static void dmi_table_string(const struct dmi_header *h, const u8 *data, u16 ver + } + } + +-static void dmi_table_dump(const u8 *buf, u32 len) ++static int dmi_table_dump(const u8 *ep, u32 ep_len, const u8 *table, ++ u32 table_len) + { ++ FILE *f; ++ ++ f = fopen(opt.dumpfile, "wb"); ++ if (!f) ++ { ++ fprintf(stderr, "%s: ", opt.dumpfile); ++ perror("fopen"); ++ return -1; ++ } ++ ++ if (!(opt.flags & FLAG_QUIET)) ++ pr_comment("Writing %d bytes to %s.", ep_len, opt.dumpfile); ++ if (fwrite(ep, ep_len, 1, f) != 1) ++ { ++ fprintf(stderr, "%s: ", opt.dumpfile); ++ perror("fwrite"); ++ goto err_close; ++ } ++ ++ if (fseek(f, 32, SEEK_SET) != 0) ++ { ++ fprintf(stderr, "%s: ", opt.dumpfile); ++ perror("fseek"); ++ goto err_close; ++ } ++ + if (!(opt.flags & FLAG_QUIET)) +- pr_comment("Writing %d bytes to %s.", len, opt.dumpfile); +- write_dump(32, len, buf, opt.dumpfile, 0); ++ pr_comment("Writing %d bytes to %s.", table_len, opt.dumpfile); ++ if (fwrite(table, table_len, 1, f) != 1) ++ { ++ fprintf(stderr, "%s: ", opt.dumpfile); ++ perror("fwrite"); ++ goto err_close; ++ } ++ ++ if (fclose(f)) ++ { ++ fprintf(stderr, "%s: ", opt.dumpfile); ++ perror("fclose"); ++ return -1; ++ } ++ ++ return 0; ++ ++err_close: ++ fclose(f); ++ return -1; + } + + static void dmi_table_decode(u8 *buf, u32 len, u16 num, u16 ver, u32 flags) +@@ -5387,11 +5432,7 @@ static int smbios3_decode(u8 *buf, const char *devmem, u32 flags) + memcpy(crafted, buf, 32); + overwrite_smbios3_address(crafted); + +- dmi_table_dump(table, len); +- if (!(opt.flags & FLAG_QUIET)) +- pr_comment("Writing %d bytes to %s.", crafted[0x06], +- opt.dumpfile); +- write_dump(0, crafted[0x06], crafted, opt.dumpfile, 1); ++ dmi_table_dump(crafted, crafted[0x06], table, len); + } + else + { +@@ -5463,11 +5504,7 @@ static int smbios_decode(u8 *buf, const char *devmem, u32 flags) + memcpy(crafted, buf, 32); + overwrite_dmi_address(crafted + 0x10); + +- dmi_table_dump(table, len); +- if (!(opt.flags & FLAG_QUIET)) +- pr_comment("Writing %d bytes to %s.", crafted[0x05], +- opt.dumpfile); +- write_dump(0, crafted[0x05], crafted, opt.dumpfile, 1); ++ dmi_table_dump(crafted, crafted[0x05], table, len); + } + else + { +@@ -5508,11 +5545,7 @@ static int legacy_decode(u8 *buf, const char *devmem, u32 flags) + memcpy(crafted, buf, 16); + overwrite_dmi_address(crafted); + +- dmi_table_dump(table, len); +- if (!(opt.flags & FLAG_QUIET)) +- pr_comment("Writing %d bytes to %s.", 0x0F, +- opt.dumpfile); +- write_dump(0, 0x0F, crafted, opt.dumpfile, 1); ++ dmi_table_dump(crafted, 0x0F, table, len); + } + else + { +diff --git a/util.c b/util.c +index 04aaadd..1547096 100644 +--- a/util.c ++++ b/util.c +@@ -259,46 +259,6 @@ out: + return p; + } + +-int write_dump(size_t base, size_t len, const void *data, const char *dumpfile, int add) +-{ +- FILE *f; +- +- f = fopen(dumpfile, add ? "r+b" : "wb"); +- if (!f) +- { +- fprintf(stderr, "%s: ", dumpfile); +- perror("fopen"); +- return -1; +- } +- +- if (fseek(f, base, SEEK_SET) != 0) +- { +- fprintf(stderr, "%s: ", dumpfile); +- perror("fseek"); +- goto err_close; +- } +- +- if (fwrite(data, len, 1, f) != 1) +- { +- fprintf(stderr, "%s: ", dumpfile); +- perror("fwrite"); +- goto err_close; +- } +- +- if (fclose(f)) +- { +- fprintf(stderr, "%s: ", dumpfile); +- perror("fclose"); +- return -1; +- } +- +- return 0; +- +-err_close: +- fclose(f); +- return -1; +-} +- + /* Returns end - start + 1, assuming start < end */ + u64 u64_range(u64 start, u64 end) + { +diff --git a/util.h b/util.h +index 3094cf8..ef24eb9 100644 +--- a/util.h ++++ b/util.h +@@ -27,5 +27,4 @@ + int checksum(const u8 *buf, size_t len); + void *read_file(off_t base, size_t *len, const char *filename); + void *mem_chunk(off_t base, size_t len, const char *devmem); +-int write_dump(size_t base, size_t len, const void *data, const char *dumpfile, int add); + u64 u64_range(u64 start, u64 end); +-- +2.41.0 + diff --git a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_2.patch b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_2.patch index dcc87d2326..971c8c0126 100644 --- a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_2.patch +++ b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_2.patch @@ -29,18 +29,18 @@ index 5477309..98f9692 100644 @@ -60,6 +60,7 @@ * https://www.dmtf.org/sites/default/files/DSP0270_1.0.1.pdf */ - + +#include #include #include #include @@ -5430,13 +5431,22 @@ static void dmi_table_string(const struct dmi_header *h, const u8 *data, u16 ver static int dmi_table_dump(const u8 *ep, u32 ep_len, const u8 *table, - u32 table_len) + u32 table_len) { + int fd; - FILE *f; - + FILE *f; + - f = fopen(opt.dumpfile, "wb"); + fd = open(opt.dumpfile, O_WRONLY|O_CREAT|O_EXCL, 0666); + if (fd == -1) diff --git a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_3.patch b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_3.patch index 01d0d1f867..5a6994065e 100644 --- a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_3.patch +++ b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_3.patch @@ -27,26 +27,26 @@ Signed-off-by: Yogita Urade 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dmidecode.c b/dmidecode.c -index 98f9692..b4dbc9d 100644 +index d339577..1ecdf85 100644 --- a/dmidecode.c +++ b/dmidecode.c -@@ -5997,17 +5997,25 @@ int main(int argc, char * const argv[]) - pr_comment("dmidecode %s", VERSION); - - /* Read from dump if so instructed */ +@@ -6031,17 +6031,25 @@ int main(int argc, char * const argv[]) + pr_comment("dmidecode %s", VERSION); + + /* Read from dump if so instructed */ + size = 0x20; - if (opt.flags & FLAG_FROM_DUMP) - { - if (!(opt.flags & FLAG_QUIET)) - pr_info("Reading SMBIOS/DMI data from file %s.", - opt.dumpfile); + if (opt.flags & FLAG_FROM_DUMP) + { + if (!(opt.flags & FLAG_QUIET)) + pr_info("Reading SMBIOS/DMI data from file %s.", + opt.dumpfile); - if ((buf = mem_chunk(0, 0x20, opt.dumpfile)) == NULL) + if ((buf = read_file(0, &size, opt.dumpfile)) == NULL) - { - ret = 1; - goto exit_free; - } - + { + ret = 1; + goto exit_free; + } + + /* Truncated entry point can't be processed */ + if (size < 0x20) + { @@ -54,16 +54,17 @@ index 98f9692..b4dbc9d 100644 + goto done; + } + - if (memcmp(buf, "_SM3_", 5) == 0) - { - if (smbios3_decode(buf, opt.dumpfile, 0)) -@@ -6031,7 +6039,6 @@ int main(int argc, char * const argv[]) - * contain one of several types of entry points, so read enough for - * the largest one, then determine what type it contains. - */ + if (memcmp(buf, "_SM3_", 5) == 0) + { + if (smbios3_decode(buf, opt.dumpfile, 0)) +@@ -6065,7 +6073,6 @@ int main(int argc, char * const argv[]) + * contain one of several types of entry points, so read enough for + * the largest one, then determine what type it contains. + */ - size = 0x20; - if (!(opt.flags & FLAG_NO_SYSFS) - && (buf = read_file(0, &size, SYS_ENTRY_FILE)) != NULL) - { --- -2.40.0 + if (!(opt.flags & FLAG_NO_SYSFS) + && (buf = read_file(0, &size, SYS_ENTRY_FILE)) != NULL) + { +-- +2.42.0 + diff --git a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_4.patch b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_4.patch index 5fa72b4f9b..a3c5af2f1c 100644 --- a/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_4.patch +++ b/meta/recipes-devtools/dmidecode/dmidecode/CVE-2023-30630_4.patch @@ -33,105 +33,106 @@ Signed-off-by: Yogita Urade 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dmidecode.c b/dmidecode.c -index b4dbc9d..870d94e 100644 +index 1ecdf85..640c079 100644 --- a/dmidecode.c +++ b/dmidecode.c @@ -5736,14 +5736,14 @@ static void overwrite_smbios3_address(u8 *buf) - buf[0x17] = 0; + buf[0x17] = 0; } - + -static int smbios3_decode(u8 *buf, const char *devmem, u32 flags) +static int smbios3_decode(u8 *buf, size_t buf_len, const char *devmem, u32 flags) { - u32 ver, len; - u64 offset; - u8 *table; - - /* Don't let checksum run beyond the buffer */ + u32 ver, len; + u64 offset; + u8 *table; + + /* Don't let checksum run beyond the buffer */ - if (buf[0x06] > 0x20) + if (buf[0x06] > buf_len) - { - fprintf(stderr, - "Entry point length too large (%u bytes, expected %u).\n", -@@ -5782,14 +5782,14 @@ static int smbios3_decode(u8 *buf, const char *devmem, u32 flags) - return 1; + { + fprintf(stderr, + "Entry point length too large (%u bytes, expected %u).\n", +@@ -5793,14 +5793,14 @@ static int smbios3_decode(u8 *buf, const char *devmem, u32 flags) + return 1; } - + -static int smbios_decode(u8 *buf, const char *devmem, u32 flags) +static int smbios_decode(u8 *buf, size_t buf_len, const char *devmem, u32 flags) { - u16 ver; - u32 len; - u8 *table; - - /* Don't let checksum run beyond the buffer */ + u16 ver, num; + u32 len; + u8 *table; + + /* Don't let checksum run beyond the buffer */ - if (buf[0x05] > 0x20) + if (buf[0x05] > buf_len) - { - fprintf(stderr, - "Entry point length too large (%u bytes, expected %u).\n", -@@ -6018,12 +6018,12 @@ int main(int argc, char * const argv[]) - - if (memcmp(buf, "_SM3_", 5) == 0) - { + { + fprintf(stderr, + "Entry point length too large (%u bytes, expected %u).\n", +@@ -6052,12 +6052,12 @@ int main(int argc, char * const argv[]) + + if (memcmp(buf, "_SM3_", 5) == 0) + { - if (smbios3_decode(buf, opt.dumpfile, 0)) + if (smbios3_decode(buf, size, opt.dumpfile, 0)) - found++; - } - else if (memcmp(buf, "_SM_", 4) == 0) - { + found++; + } + else if (memcmp(buf, "_SM_", 4) == 0) + { - if (smbios_decode(buf, opt.dumpfile, 0)) + if (smbios_decode(buf, size, opt.dumpfile, 0)) - found++; - } - else if (memcmp(buf, "_DMI_", 5) == 0) -@@ -6046,12 +6046,12 @@ int main(int argc, char * const argv[]) - pr_info("Getting SMBIOS data from sysfs."); - if (size >= 24 && memcmp(buf, "_SM3_", 5) == 0) - { + found++; + } + else if (memcmp(buf, "_DMI_", 5) == 0) +@@ -6080,12 +6080,12 @@ int main(int argc, char * const argv[]) + pr_info("Getting SMBIOS data from sysfs."); + if (size >= 24 && memcmp(buf, "_SM3_", 5) == 0) + { - if (smbios3_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET)) + if (smbios3_decode(buf, size, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET)) - found++; - } - else if (size >= 31 && memcmp(buf, "_SM_", 4) == 0) - { + found++; + } + else if (size >= 31 && memcmp(buf, "_SM_", 4) == 0) + { - if (smbios_decode(buf, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET)) + if (smbios_decode(buf, size, SYS_TABLE_FILE, FLAG_NO_FILE_OFFSET)) - found++; - } - else if (size >= 15 && memcmp(buf, "_DMI_", 5) == 0) -@@ -6088,12 +6088,12 @@ int main(int argc, char * const argv[]) - - if (memcmp(buf, "_SM3_", 5) == 0) - { + found++; + } + else if (size >= 15 && memcmp(buf, "_DMI_", 5) == 0) +@@ -6122,12 +6122,12 @@ int main(int argc, char * const argv[]) + + if (memcmp(buf, "_SM3_", 5) == 0) + { - if (smbios3_decode(buf, opt.devmem, 0)) + if (smbios3_decode(buf, 0x20, opt.devmem, 0)) - found++; - } - else if (memcmp(buf, "_SM_", 4) == 0) - { + found++; + } + else if (memcmp(buf, "_SM_", 4) == 0) + { - if (smbios_decode(buf, opt.devmem, 0)) + if (smbios_decode(buf, 0x20, opt.devmem, 0)) - found++; - } - goto done; -@@ -6114,7 +6114,7 @@ memory_scan: - { - if (memcmp(buf + fp, "_SM3_", 5) == 0) - { + found++; + } + goto done; +@@ -6148,7 +6148,7 @@ int main(int argc, char * const argv[]) + { + if (memcmp(buf + fp, "_SM3_", 5) == 0) + { - if (smbios3_decode(buf + fp, opt.devmem, 0)) + if (smbios3_decode(buf + fp, 0x20, opt.devmem, 0)) - { - found++; - goto done; -@@ -6127,7 +6127,7 @@ memory_scan: - { - if (memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0) - { + { + found++; + goto done; +@@ -6161,7 +6161,7 @@ int main(int argc, char * const argv[]) + { + if (memcmp(buf + fp, "_SM_", 4) == 0 && fp <= 0xFFE0) + { - if (smbios_decode(buf + fp, opt.devmem, 0)) + if (smbios_decode(buf + fp, 0x20, opt.devmem, 0)) - { - found++; - goto done; --- -2.35.5 + { + found++; + goto done; +-- +2.42.0 + diff --git a/meta/recipes-devtools/dmidecode/dmidecode_3.4.bb b/meta/recipes-devtools/dmidecode/dmidecode_3.4.bb index 4d5255df64..cdc628a4ea 100644 --- a/meta/recipes-devtools/dmidecode/dmidecode_3.4.bb +++ b/meta/recipes-devtools/dmidecode/dmidecode_3.4.bb @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263" SRC_URI = "${SAVANNAH_NONGNU_MIRROR}/dmidecode/${BP}.tar.xz \ file://0001-Committing-changes-from-do_unpack_extra.patch \ - file://CVE-2023-30630_1.patch \ + file://CVE-2023-30630_1a.patch \ + file://CVE-2023-30630_1b.patch \ file://CVE-2023-30630_2.patch \ file://CVE-2023-30630_3.patch \ file://CVE-2023-30630_4.patch \ From patchwork Fri Oct 20 15:51:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32665 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 54CD2C001DF for ; Fri, 20 Oct 2023 15:51:49 +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.web10.57859.1697817099405287313 for ; Fri, 20 Oct 2023 08:51:39 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=tFH4nPNJ; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1c9d922c039so7783645ad.3 for ; Fri, 20 Oct 2023 08:51:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817098; x=1698421898; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=e/Grj0ohc8t6pgqsbMApo96uru6LjSPZoujR07AaFcg=; b=tFH4nPNJ3WnMoYrMyq4IMTZDdwF4VjH82j/qjCUgIYd2o6WgCkluvD/pJM+X81mfwu ploZkfuNfiCJQzvvuZZb8xho/xyGPX86q8ljbdURMkBenQjALvGNZt0MkefhCRmoT2GT NLb1372q8fEao76ULklD/0wtZmycrTX5Bz51npDdWlUL2sdFeSUIUHIvnmLyBiUjL10s UeJONkTi4dD7F67h68dzM0W980dOyRG9oTjjlhdl2FsUmBEfnVX/rWGeZWV5utbZ9nUA 9K0b/dwa8SkX+SGBZzfmHbwvXW+CllIWNZBmRDV+F/TNgVSPWJY0x9Eggk7Kuf3+XpAI 35bA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817098; x=1698421898; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=e/Grj0ohc8t6pgqsbMApo96uru6LjSPZoujR07AaFcg=; b=gBG2kxBE7++VXoS8IrZWSOpD1ls0O4NTk4MhRGGsB4PeFF1FswhfL1ocres4dw+doB u8PFfmLeOmbpAvwJKvOYz65wDFtO4E7UhX4BGOvtKj2dlRlPMSZLNj9BSXvsU75hUOaL ARvuL+nFyCZHIrT/O2u9t9ZkMY5BkVxlrdcinyX7t7yDGPAT2cWJGxFaAzuOwGIsWJlX fCvtSMjCj1WdxwZ+w9F04Zi0I77pcPW31YwlLLWTUYLKMS/4v0TBiulS+oicoiqg7pqE owO8k2dmlja/t2HpOSGawulnS889DeqnvnR2MC5S+W5hkzYWD6GZDdbQOB9wOZQQPFWr FfVA== X-Gm-Message-State: AOJu0YzEJpOuGWEA/xDYj/wFeAh296Ueakkrub1Htq5pVz+kcPhd9zog ekiKKBYttriFyydMkTNtzT3EbQDCS46f/wK3A+0= X-Google-Smtp-Source: AGHT+IH/c6iFMPj+rXC3nhRzqC61fh9HQdM0nIMEBajI5NgZp5nO4+8D1iXAqa1N5yjGXqtz0T1hkA== X-Received: by 2002:a17:902:db12:b0:1c2:218c:3754 with SMTP id m18-20020a170902db1200b001c2218c3754mr2359924plx.53.1697817098081; Fri, 20 Oct 2023 08:51:38 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:37 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 03/24] qemu: ignore RHEL specific CVE-2023-2680 Date: Fri, 20 Oct 2023 05:51:05 -1000 Message-Id: <7300254fdb6659c0a7462c64133f893d1a152850.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189548 From: Lee Chee Yang Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 00decc57e5..a7f1099dd5 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -67,6 +67,10 @@ CVE_CHECK_IGNORE += "CVE-2018-18438" # this bug related to windows specific. CVE_CHECK_IGNORE += "CVE-2023-0664" +# As per https://bugzilla.redhat.com/show_bug.cgi?id=2203387 +# RHEL specific issue +CVE_CHECK_IGNORE += "CVE-2023-2680" + COMPATIBLE_HOST:mipsarchn32 = "null" COMPATIBLE_HOST:mipsarchn64 = "null" COMPATIBLE_HOST:riscv32 = "null" From patchwork Fri Oct 20 15:51:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32668 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 59E8FC0032E for ; Fri, 20 Oct 2023 15:51:49 +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.web10.57860.1697817101149470423 for ; Fri, 20 Oct 2023 08:51:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=t/R3chac; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1c9b1e3a809so7226225ad.2 for ; Fri, 20 Oct 2023 08:51:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817100; x=1698421900; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=768Hamxh1W7UHjXIzL4qVKf4VJVdj4GmOWJRL9ZTihU=; b=t/R3chacQSZ2535nwdOH9ceM9484G7bAM6QchUjkN9o/RoVUDYyhWjFEm0jeffFrQk rpf31z2E84rGX7eChczUlBb5Bn/AdckbxYnAhUGmTM/IJf6GUJRqgtatwrJ+sumpwo8y EJWyULokbHNxXKUmSqpaMzn7irK/Att1yoFg8ZLkS3ufUCWzKSE1A5bXa40OnW6Ii1qR SJz8t2JuPHcDQUyQJSn1HseAT8LWuHZ49i8rdccRZGSr/ThFEPiWb2wEypjU/RMuPbbg 0k6Rj5EVbXoep7lQHCNyJaREWoMXulI7efmM41F+IL69a2kBiwYnXSVaZeM17j108ur1 SFyw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817100; x=1698421900; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=768Hamxh1W7UHjXIzL4qVKf4VJVdj4GmOWJRL9ZTihU=; b=JPFLhRxaXnJReu51eYcAcafbt9l0g0VVkeHpnnOc/QRHrie+w8oWTAeaFmkHIFDj0k 0NJitbvJkD3pFjWiAoMDmV3fyE3w0zqYlzo/Vu1ZrvJH8i/1bbi/7Ho5U22aT0+tzMCY YP6yAn2St70qYRFEFzE8PEL4BK7at3PUNYo3SVn5CkfzAj25z7McICMnR/mfyPJergEv 4wvthUvq2PGs1UuCau2gwDTk6KMns2MgQYtYsUJZvUWE6v4a5Y82qw3gSBCAgWxOknDg RE7GHGMGAu/tOAc95PvCBU5Ni2arzniHDlvdVPfFpYSREdNKQa24fOBrfncnapyDoJFp S4GQ== X-Gm-Message-State: AOJu0YwU2CL85+6pEpcW5s0Bse/PrUpU0k0nMe2sRCrGpL7zm1nOL8jA fFQvPXHvxbvb/7SB2T8X9KCdz9cUNtzzysqYcH8= X-Google-Smtp-Source: AGHT+IFxNMhFHp4GGOHQ2VbFz8H3OIIsDl7DRMb6bCC4+w5kdHcPo6XpUNbuJ06RpFxFm/f2N82hNA== X-Received: by 2002:a17:902:dac9:b0:1bb:30c5:835a with SMTP id q9-20020a170902dac900b001bb30c5835amr2733677plx.7.1697817099956; Fri, 20 Oct 2023 08:51:39 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 04/24] cve-check: add CVSS vector string to CVE database and reports Date: Fri, 20 Oct 2023 05:51:06 -1000 Message-Id: <587ae7bc85fc471d927308d866821d463799023d.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189549 From: Antoine Lubineau This allows building detailed vulnerability analysis tools without relying on external resources. Signed-off-by: Antoine Lubineau Signed-off-by: Alexandre Belloni (cherry picked from commit 048ff0ad927f4d37cc5547ebeba9e0c221687ea6) Signed-off-by: Steve Sakoman --- meta/classes/cve-check.bbclass | 5 ++++- meta/recipes-core/meta/cve-update-nvd2-native.bb | 11 ++++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/meta/classes/cve-check.bbclass b/meta/classes/cve-check.bbclass index bd9e7e7445..3846aee5ea 100644 --- a/meta/classes/cve-check.bbclass +++ b/meta/classes/cve-check.bbclass @@ -32,7 +32,7 @@ CVE_PRODUCT ??= "${BPN}" CVE_VERSION ??= "${PV}" CVE_CHECK_DB_DIR ?= "${DL_DIR}/CVE_CHECK" -CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/nvdcve_2.db" +CVE_CHECK_DB_FILE ?= "${CVE_CHECK_DB_DIR}/nvdcve_2-1.db" CVE_CHECK_DB_FILE_LOCK ?= "${CVE_CHECK_DB_FILE}.lock" CVE_CHECK_LOG ?= "${T}/cve.log" @@ -403,6 +403,7 @@ def get_cve_info(d, cves): cve_data[row[0]]["scorev3"] = row[3] cve_data[row[0]]["modified"] = row[4] cve_data[row[0]]["vector"] = row[5] + cve_data[row[0]]["vectorString"] = row[6] cursor.close() conn.close() return cve_data @@ -459,6 +460,7 @@ def cve_write_data_text(d, patched, unpatched, ignored, cve_data): write_string += "CVSS v2 BASE SCORE: %s\n" % cve_data[cve]["scorev2"] write_string += "CVSS v3 BASE SCORE: %s\n" % cve_data[cve]["scorev3"] write_string += "VECTOR: %s\n" % cve_data[cve]["vector"] + write_string += "VECTORSTRING: %s\n" % cve_data[cve]["vectorString"] write_string += "MORE INFORMATION: %s%s\n\n" % (nvd_link, cve) if unpatched_cves and d.getVar("CVE_CHECK_SHOW_WARNINGS") == "1": @@ -573,6 +575,7 @@ def cve_write_data_json(d, patched, unpatched, ignored, cve_data, cve_status): "scorev2" : cve_data[cve]["scorev2"], "scorev3" : cve_data[cve]["scorev3"], "vector" : cve_data[cve]["vector"], + "vectorString" : cve_data[cve]["vectorString"], "status" : status, "link": issue_link } diff --git a/meta/recipes-core/meta/cve-update-nvd2-native.bb b/meta/recipes-core/meta/cve-update-nvd2-native.bb index 2f7dad7e82..d0321f1bb5 100644 --- a/meta/recipes-core/meta/cve-update-nvd2-native.bb +++ b/meta/recipes-core/meta/cve-update-nvd2-native.bb @@ -225,7 +225,7 @@ def initialize_db(conn): c.execute("CREATE TABLE IF NOT EXISTS META (YEAR INTEGER UNIQUE, DATE TEXT)") c.execute("CREATE TABLE IF NOT EXISTS NVD (ID TEXT UNIQUE, SUMMARY TEXT, \ - SCOREV2 TEXT, SCOREV3 TEXT, MODIFIED INTEGER, VECTOR TEXT)") + SCOREV2 TEXT, SCOREV3 TEXT, MODIFIED INTEGER, VECTOR TEXT, VECTORSTRING TEXT)") c.execute("CREATE TABLE IF NOT EXISTS PRODUCTS (ID TEXT, \ VENDOR TEXT, PRODUCT TEXT, VERSION_START TEXT, OPERATOR_START TEXT, \ @@ -299,6 +299,7 @@ def update_db(conn, elt): """ accessVector = None + vectorString = None cveId = elt['cve']['id'] if elt['cve']['vulnStatus'] == "Rejected": return @@ -309,25 +310,29 @@ def update_db(conn, elt): date = elt['cve']['lastModified'] try: accessVector = elt['cve']['metrics']['cvssMetricV2'][0]['cvssData']['accessVector'] + vectorString = elt['cve']['metrics']['cvssMetricV2'][0]['cvssData']['vectorString'] cvssv2 = elt['cve']['metrics']['cvssMetricV2'][0]['cvssData']['baseScore'] except KeyError: cvssv2 = 0.0 cvssv3 = None try: accessVector = accessVector or elt['cve']['metrics']['cvssMetricV30'][0]['cvssData']['attackVector'] + vectorString = vectorString or elt['cve']['metrics']['cvssMetricV30'][0]['cvssData']['vectorString'] cvssv3 = elt['cve']['metrics']['cvssMetricV30'][0]['cvssData']['baseScore'] except KeyError: pass try: accessVector = accessVector or elt['cve']['metrics']['cvssMetricV31'][0]['cvssData']['attackVector'] + vectorString = vectorString or elt['cve']['metrics']['cvssMetricV31'][0]['cvssData']['vectorString'] cvssv3 = cvssv3 or elt['cve']['metrics']['cvssMetricV31'][0]['cvssData']['baseScore'] except KeyError: pass accessVector = accessVector or "UNKNOWN" + vectorString = vectorString or "UNKNOWN" cvssv3 = cvssv3 or 0.0 - conn.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?)", - [cveId, cveDesc, cvssv2, cvssv3, date, accessVector]).close() + conn.execute("insert or replace into NVD values (?, ?, ?, ?, ?, ?, ?)", + [cveId, cveDesc, cvssv2, cvssv3, date, accessVector, vectorString]).close() try: for config in elt['cve']['configurations']: From patchwork Fri Oct 20 15:51:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32664 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 660E0CDB474 for ; Fri, 20 Oct 2023 15:51:49 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web10.57861.1697817102448705231 for ; Fri, 20 Oct 2023 08:51:42 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Ciw4yJ2J; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6b20577ef7bso846229b3a.3 for ; Fri, 20 Oct 2023 08:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817101; x=1698421901; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MgBHHUNo6p2x9/2KeXvYlyk7ceaNjsjfyo/ABYrk5pU=; b=Ciw4yJ2JKHoRXtz2Q+/s7KfYiXbSzWfi4hZnbheHluxIaR9XSnMN9MYr3yIKVAMoBA iH1Xk1XJ4mQ8znQ5z4pdGVf3P18MDqtFK5s1GjAmqQkBVSz5CliV3DAviP4PQ0Tw7xi6 8drnu6/53Yq0bXre7CCGLGxyd2SJD52/Za6xB8gvZKGHfmlXBZbpNuNNY+GMA9c7P8rc 98wLtE4DHtAGAB2+zShS/7FOwQrEF9XFnbqnGPjbxsgQg8FiwHVyt2k9LucZh8PbwB+t NM+2v6plsT+q0MBJt7PYzgsZktN5NN+w+LVCN1jeVG+rWmjQ1b+EBdafpqDd14t7KRAN h4nw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817101; x=1698421901; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MgBHHUNo6p2x9/2KeXvYlyk7ceaNjsjfyo/ABYrk5pU=; b=we+8y0vJN3X4oY3cWDbwNogYnoZ3hVci8cKFWVG69Zo/WU+gikmkmaLMplXOP8VY81 NpJgLP2TzPOnCTjOb9P/M0ovxWlm3pnZSMQb4Tp1ysvtuDnUq3Hj3mtDVXAc3sKnn/Yz GxHiUknahjN/A4YWOi6UvnjVK6xN4NZ//eV8AQ+81mpQRRYVC6AsA/o/DMMKP8iTXnYG 2zQ4jo1Do2UWWHwyVjKtORPWCU+o74HdA+IU6zX5JsvX8QonLNVzo4MXtxi4Y/LlXcmS XzrAVY7tkR/K51R/sJdkBog9fUHZuyBCCpqpjbLtOVK7lnGikN+OYn/Z9Qpd4vNHyBuO knOA== X-Gm-Message-State: AOJu0YxR/OD/BmASDK6jb3aWi+eiVrJVdHgH7l7X1lNTMklM2ZztNkDE WC+7CpWwOs+nN6VPeSg6vBfY2RZ27KOAY32hZio= X-Google-Smtp-Source: AGHT+IGU0yo1ra5JvSegFmPdsO03H1RoSYZMqiXDCknkqZqUQ8/Bw7vjyiPqfeM/6be/2KZ00ndXwA== X-Received: by 2002:a05:6a20:2451:b0:135:4df7:f165 with SMTP id t17-20020a056a20245100b001354df7f165mr2245394pzc.21.1697817101584; Fri, 20 Oct 2023 08:51:41 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:41 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 05/24] python3-urllib3: 1.26.15 -> 1.26.17 Date: Fri, 20 Oct 2023 05:51:07 -1000 Message-Id: <7466db00ca2f884cf58504c3910b858a87f33128.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189550 From: Lee Chee Yang 1.26.17 (2023-10-02) Added the Cookie header to the list of headers to strip from requests when redirecting to a different host. As before, different headers can be set via Retry.remove_headers_on_redirect. (CVE-2023-43804) 1.26.16 (2023-05-23) Fixed thread-safety issue where accessing a PoolManager with many distinct origins would cause connection pools to be closed while requests are in progress (#2954) Signed-off-by: Lee Chee Yang Signed-off-by: Steve Sakoman --- .../{python3-urllib3_1.26.15.bb => python3-urllib3_1.26.17.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/python/{python3-urllib3_1.26.15.bb => python3-urllib3_1.26.17.bb} (86%) diff --git a/meta/recipes-devtools/python/python3-urllib3_1.26.15.bb b/meta/recipes-devtools/python/python3-urllib3_1.26.17.bb similarity index 86% rename from meta/recipes-devtools/python/python3-urllib3_1.26.15.bb rename to meta/recipes-devtools/python/python3-urllib3_1.26.17.bb index d2de7c4c02..57b166870a 100644 --- a/meta/recipes-devtools/python/python3-urllib3_1.26.15.bb +++ b/meta/recipes-devtools/python/python3-urllib3_1.26.17.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://github.com/shazow/urllib3" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c2823cb995439c984fd62a973d79815c" -SRC_URI[sha256sum] = "8a388717b9476f934a21484e8c8e61875ab60644d29b9b39e11e4b9dc1c6b305" +SRC_URI[sha256sum] = "24d6a242c28d29af46c3fae832c36db3bbebcc533dd1bb549172cd739c82df21" inherit pypi setuptools3 From patchwork Fri Oct 20 15:51:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32667 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 6E8C7C07480 for ; Fri, 20 Oct 2023 15:51:49 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web11.58029.1697817104387097989 for ; Fri, 20 Oct 2023 08:51:44 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=1Rfki50e; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1c9b95943beso7861775ad.1 for ; Fri, 20 Oct 2023 08:51:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817103; x=1698421903; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=ZMOWdGzIcW9qYtVM9JRjFQL0hp1IQfgR0ZbBTEj/1F8=; b=1Rfki50e9YwwtvgixktT3A/qjBn6LqqF8kCNiUIZSKkYbaEl8lWqFOM/enOSyQ2CLf iffScfL3AvKdbfvmPQD89RB8jqiA05F1qBQRSqq8BVLMMogs2sYEV0EH5djhEDW8N/bh lzZVlG+LzlCheY9kv1LZuLV9BVdikuLBM3rkx6d23cYQBgjnKKPgbuQOPAO5DIII2wuO +HQl7m9CE/jx2b60L/P7hqD3DnZmcfYKSwltfG3GRvdk7sUUPwlAh5mAUe7qzEGB0cNL tidPiNiw7qx2Y98xVvstBUex2dEBGaPZcOGF7zPER0alC+thbQ++0viWg4MBg4/29ByV 3rhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817103; x=1698421903; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZMOWdGzIcW9qYtVM9JRjFQL0hp1IQfgR0ZbBTEj/1F8=; b=S7irqbm5m7ySVH5rAJP1/W4+52b207RMZ+0gsP70ZSK+ON3luaQQXFCL5IteZ4d423 RQwYpIFtYSyTA4KA6ohw8w1iMyPOurrMaZgc0YWqgyQ+LGEbJMlJejRgURJtxTOBMV1h IzsAcZsOAE6E119n92bp5j6kiiI0LFzk6wYZE2geduMs3stYslqC5ooIVpM9Oh1kxHa0 P1iaPlCIFllaKa/hkYLU60qX92A+yIREIdXxYB3+EA4Al0fWaDKQG5/xT3nMPq/0u0jq wo670txkLMdBXEP7vUXupIwcuCSPvyWFe01FiWfy/QetD5E82DaJFCYNzS/PdBgouz4f TL9w== X-Gm-Message-State: AOJu0Yx56pQUIl4bb5Zm1AmckiaRdSZHlb0F19oUjofWrlJAxFoG/LS9 Kz5yG9rRv0VXQI3RRO2WLt4YiwHSBkbrP27xOC0= X-Google-Smtp-Source: AGHT+IHBuvQHXhswLVjoIbqu7Yd6Tn646Z4P+L6s5ZP56YvVuW+/WiKV3TXEEhaJ8uj7bU8MSMD9OA== X-Received: by 2002:a17:902:d054:b0:1c9:ff46:163d with SMTP id l20-20020a170902d05400b001c9ff46163dmr2198764pll.38.1697817103516; Fri, 20 Oct 2023 08:51:43 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:43 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 06/24] libx11: upgrade to 1.8.7 Date: Fri, 20 Oct 2023 05:51:08 -1000 Message-Id: <79f9c062df37ca15649d41bb6501e6fab2d73114.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189551 From: Ross Burton This incorporates fixes for the following CVEs: - CVE-2023-43785 - CVE-2023-43786 - CVE-2023-43787 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit a1534bb34b680bfc5cb2f35b5fd5a0c2afed6368) Signed-off-by: Steve Sakoman --- .../xorg-lib/{libx11_1.8.6.bb => libx11_1.8.7.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xorg-lib/{libx11_1.8.6.bb => libx11_1.8.7.bb} (92%) diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.8.6.bb b/meta/recipes-graphics/xorg-lib/libx11_1.8.7.bb similarity index 92% rename from meta/recipes-graphics/xorg-lib/libx11_1.8.6.bb rename to meta/recipes-graphics/xorg-lib/libx11_1.8.7.bb index 1cfa56b21e..5f14e62446 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.8.6.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.8.7.bb @@ -24,7 +24,7 @@ XORG_PN = "libX11" SRC_URI += "file://disable_tests.patch" -SRC_URI[sha256sum] = "59535b7cc6989ba806a022f7e8533b28c4397b9d86e9d07b6df0c0703fa25cc9" +SRC_URI[sha256sum] = "05f267468e3c851ae2b5c830bcf74251a90f63f04dd7c709ca94dc155b7e99ee" inherit gettext From patchwork Fri Oct 20 15:51:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32666 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 75A39C00A98 for ; Fri, 20 Oct 2023 15:51:49 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web11.58030.1697817106379760514 for ; Fri, 20 Oct 2023 08:51:46 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=wMIHy3hV; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1c434c33ec0so7176805ad.3 for ; Fri, 20 Oct 2023 08:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817105; x=1698421905; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4f15XwvlS6rb0etmCQ9b4gcV41mTlE80C88M4vurQtc=; b=wMIHy3hVvGHQ8uFUMVle2Q2wWCB0nNRbbltzKfnWiUxuoGWoiFo1q8n07iJ4Km55RH TrUSesOofkUwTKva3ZYojq7wNutsDLPNwkE5sZDK/GfHgZ4xkV0qhb1tHLJihd6axuV8 2lbiLoODXzeFoCO+8sQrPXYGC41mHfz6+uaoasrx8tep1hyYHy0AXE/F85JRXBY+pYuy ClzEz90tpaDOr1JSkKiNwuh/Cw1/wTtsajurslvtPLNbEYDVKIXGhf9BoObuhYvZCA8Q lmRGYtVPYz+ZLC/7qphD5DmStLUkwudZcBayOOXivdnZEcEb92pWpnQRl0E7M1r6yFnM rQqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817105; x=1698421905; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4f15XwvlS6rb0etmCQ9b4gcV41mTlE80C88M4vurQtc=; b=OBD2zQk0shskSWTMEu/FlIra1DXM7UFxAruusG716b0ouhlQPfyjY+sGkNhkq5aTn8 5TNqtWIALZtbQf6qMUykAYsO2nzvN3H208NBQJP2ZUXCIWnowwjBmlygwpzA+ytWczIw Tj/aJUwrgirqaLdCRAnVhQHfFCNtgDDi4sPSajoBM2Wy8NI9iRMmh4Og8YPNXm18Y/An YX/HCZ84XKZG9Uk/X9jIOWHlGMKhqoUbh7lRGV6Bk4TIA8pzcXNsuwsp1j7fXnf5avCS BQBhv3Wtxm9g9WBg5MJEfKamGCDZX66p9FT3r9bNwl1o5mA6hHxeWHwMquh8uf4UeWFc CVgg== X-Gm-Message-State: AOJu0YxevS3fDItiX6CZVjeOZ6zTfuUilxgfhHIgnR6on49Jwa88snio OFPYsi8pxcZXPX/Ki6lvlY9d0Z9p/+vUHcrhj3c= X-Google-Smtp-Source: AGHT+IFXDpBWv8AaoQHedlsedGdZIfjsynUdAzMYxrxtqLjC5r4fWjLN+hO2DSn0vrrQwU7WhNe8dg== X-Received: by 2002:a17:902:e74a:b0:1c7:5a63:43bb with SMTP id p10-20020a170902e74a00b001c75a6343bbmr2251853plf.8.1697817105121; Fri, 20 Oct 2023 08:51:45 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:44 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 07/24] libxpm: upgrade to 3.5.17 Date: Fri, 20 Oct 2023 05:51:09 -1000 Message-Id: X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189552 From: Ross Burton This release fixes the following CVEs: - CVE-2023-43788 - CVE-2023-43789 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 46dd8ce41756dbc2aa0f9001416f208cced1c8d5) Signed-off-by: Steve Sakoman --- .../xorg-lib/{libxpm_3.5.16.bb => libxpm_3.5.17.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-graphics/xorg-lib/{libxpm_3.5.16.bb => libxpm_3.5.17.bb} (88%) diff --git a/meta/recipes-graphics/xorg-lib/libxpm_3.5.16.bb b/meta/recipes-graphics/xorg-lib/libxpm_3.5.17.bb similarity index 88% rename from meta/recipes-graphics/xorg-lib/libxpm_3.5.16.bb rename to meta/recipes-graphics/xorg-lib/libxpm_3.5.17.bb index c3d01f1bb3..8e15ecc0d4 100644 --- a/meta/recipes-graphics/xorg-lib/libxpm_3.5.16.bb +++ b/meta/recipes-graphics/xorg-lib/libxpm_3.5.17.bb @@ -22,6 +22,6 @@ PACKAGES =+ "sxpm cxpm" FILES:cxpm = "${bindir}/cxpm" FILES:sxpm = "${bindir}/sxpm" -SRC_URI[sha256sum] = "e6bc5da7a69dbd9bcc67e87c93d4904fe2f5177a0711c56e71fa2f6eff649f51" +SRC_URI[sha256sum] = "64b31f81019e7d388c822b0b28af8d51c4622b83f1f0cb6fa3fc95e271226e43" BBCLASSEXTEND = "native" From patchwork Fri Oct 20 15:51:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32669 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 923AEC19F5C for ; Fri, 20 Oct 2023 15:51:49 +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.web10.57862.1697817108156575570 for ; Fri, 20 Oct 2023 08:51:48 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=vCpkgm1R; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1cac80292aeso6397015ad.1 for ; Fri, 20 Oct 2023 08:51:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817107; x=1698421907; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=YRTx4n6TrFGNY5SpauogoCSq71/qBVPnm3IsG2eyMg8=; b=vCpkgm1RpGRQujP/+QoG82n0y0zY6cjLhbO5Liv+IgGL1d98HEAHYSdul47ZeqUPzG b/ZFdbzM9YJfdpIJ1C7HuUsK+iDvSIvEDlmBp9lbM/k03kz3C2Uwzff7WzhyaJx5ARZx Ek4oQ5j5IiwmyeDbY1W6flna1EiekrHLogvp5BK3GZCpnCVtTSUa5fkhT6j+jaKezOip GvZpiMT5Gsek0BdevYzq+DeBXAFOIiKNweiaok3vyOv2Fbg/orGyVpE5gwr2ExDnl9GW KI4VIQWsD3HJAqFoyaKXrJ9MRKu9q74bbSAb9kFPQUFmdIq49GmucwFyaa21+9BjJQKw 61ZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817107; x=1698421907; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=YRTx4n6TrFGNY5SpauogoCSq71/qBVPnm3IsG2eyMg8=; b=aqPTaGunXHN4oX3QN2yg8mbLSNX8OE2qvADaoXi5CKdn61fIgIfw0gr3vfmG8IgBGE W7QF73HPs+sTZd+aqmdAZ50DPLhBhjHUJDrgc4enQ0ldKiPBy2/XGEi4NUkuKCtNz+8A Y/lJ26LlgFDx1BbgpF59NGDkxVnH0OWH4MWlM+fceUuLD3fHNc4ck+YCL05tCcFCcBSZ hGeEMrqcGHcuaMMM7YIypugxYO9P5iGItw6eq1tv9+Cqri2s18F9idIKqx41ltsoGikl 8SXPbmwGvXjDYbrVR9BF2ttMga5T5fd9+Y7AYMzdNf5OCf6J3EzsL98XeVEqa8QjFmWU H5kQ== X-Gm-Message-State: AOJu0YwFsrQu1NQvyXDdPbELUp6n1Gk8+lK14RgZEGsj8IBEEi54lFP8 VAjD699jBAt39utrbWOiq0VXSPwGv5cWreI2i6I= X-Google-Smtp-Source: AGHT+IHBA4JGuzmbBX+rXqnFUB5rJyuDGHS2BPmbLyfPCeIoiI4ZTtprGDr65iwy6x54EaERRUhH7w== X-Received: by 2002:a17:903:c5:b0:1c9:bef4:e11 with SMTP id x5-20020a17090300c500b001c9bef40e11mr2081335plc.46.1697817106899; Fri, 20 Oct 2023 08:51:46 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:46 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 08/24] linux-yocto/6.1: update to v6.1.55 Date: Fri, 20 Oct 2023 05:51:10 -1000 Message-Id: <282e9a1fbedec54a3879323bf5f67a4a6ac3a376.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189553 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: d23900f974e0 Linux 6.1.55 0db211ec0f1d interconnect: Teach lockdep about icc_bw_lock order b93aeb6352b0 net/sched: Retire rsvp classifier 4c6bb9158179 drm/amdgpu: fix amdgpu_cs_p1_user_fence 45ea58f9dbf8 Revert "memcg: drop kmem.limit_in_bytes" 4422080e777e drm/amd/display: fix the white screen issue when >= 64GB DRAM 97d4186c3503 ext4: fix rec_len verify error 89365b624af5 scsi: pm8001: Setup IRQs on resume c2cb422dca0b scsi: megaraid_sas: Fix deadlock on firmware crashdump 890e1e5dd8ba ata: libahci: clear pending interrupt status a3517ee1d4e6 ata: libata: disallow dev-initiated LPM transitions to unsupported states 30057f4add41 i2c: aspeed: Reset the i2c controller when timeout occurs 8b0f7d55b22e tracefs: Add missing lockdown check to tracefs_create_dir() dcf3caeee432 nfsd: fix change_info in NFSv4 RENAME replies 978b86fbdb2a selinux: fix handling of empty opts in selinux_fs_context_submount() 2617afde0c3d tracing: Have option files inc the trace array ref count 6dc57c3a1d13 tracing: Have current_trace inc the trace array ref count a46bf337a20f tracing: Increase trace array ref count on enable and filter files 0c2982b01501 tracing: Have event inject files inc the trace array ref count d65553fe5281 tracing: Have tracing_max_latency inc the trace array ref count 1f89e6daf2b0 btrfs: check for BTRFS_FS_ERROR in pending ordered assert 50e385d98b2a btrfs: release path before inode lookup during the ino lookup ioctl 52932bbc6d4b btrfs: fix a compilation error if DEBUG is defined in btree_dirty_folio 32247b9526bf btrfs: fix lockdep splat and potential deadlock after failure running delayed items d7b2abd87d1f dm: don't attempt to queue IO under RCU protection 216eae7d7dea Revert "drm/amd: Disable S/G for APUs when 64GB or more host memory" 98ea94f1627b md: Put the right device in md_seq_next f07c0bc27b0e nvme: avoid bogus CRTO values 6a1d1365fafe io_uring/net: fix iter retargeting for selected buf e7dcf8339a0f ovl: fix incorrect fdput() on aio completion 17854d92fa4a ovl: fix failed copyup of fileattr on a symlink 6a84939cc7dd attr: block mode changes of symlinks 3494a0066d8a Revert "SUNRPC: Fail faster on bad verifier" ba4f28a1d362 md/raid1: fix error: ISO C90 forbids mixed declarations 2076b4b677c3 samples/hw_breakpoint: fix building without module unloading 0dea06849924 x86/purgatory: Remove LTO flags 2074cb608cb5 x86/boot/compressed: Reserve more memory for page tables 038249ee7264 panic: Reenable preemption in WARN slowpath 6069b9d8056d scsi: lpfc: Fix the NULL vs IS_ERR() bug for debugfs_create_file() 1cd41d1669bc scsi: target: core: Fix target_cmd_counter leak dd8fce4e2da5 riscv: kexec: Align the kexeced kernel entry e9b8e266105a x86/ibt: Suppress spurious ENDBR 03425393f41c selftests: tracing: Fix to unmount tracefs for recovering environment bc912eed8a1a scsi: qla2xxx: Fix NULL vs IS_ERR() bug for debugfs_create_dir() cbf226355ee3 drm: gm12u320: Fix the timeout usage for usb_bulk_msg() 64561352c0f2 nvmet-tcp: pass iov_len instead of sg->length to bvec_set_page() 5ee5c928dbb6 nvmet: use bvec_set_page to initialize bvecs 00cf1dc13c1f block: factor out a bvec_set_page helper 2174731a17b0 btrfs: compare the correct fsid/metadata_uuid in btrfs_validate_super 31242daa108b btrfs: add a helper to read the superblock metadata_uuid 44751b057c24 MIPS: Use "grep -E" instead of "egrep" 8332311cd02a misc: fastrpc: Fix incorrect DMA mapping unmap request 5a5641755ca8 misc: fastrpc: Prepare to dynamic dma-buf locking specification b4539ff7a48d dma-buf: Add unlocked variant of attachment-mapping functions 6ca28642dd9a printk: Consolidate console deferred printing 13ebf3ff08b0 printk: Keep non-panic-CPUs out of console lock ee42bfc791aa interconnect: Fix locking for runpm vs reclaim 48aebbe801e7 kobject: Add sanity check for kset->kobj.ktype in kset_register() 240571c49f76 media: pci: ipu3-cio2: Initialise timing struct to avoid a compiler warning 91f400233edc usb: chipidea: add workaround for chipidea PEC bug 8e3556f2f497 usb: ehci: add workaround for chipidea PORTSC.PEC bug 48c135c30ad2 misc: open-dice: make OPEN_DICE depend on HAS_IOMEM a3c9315a8c78 serial: cpm_uart: Avoid suspicious locking 4738bf8b2d36 scsi: target: iscsi: Fix buffer overflow in lio_target_nacl_info_show() 6c440fec96af tools: iio: iio_generic_buffer: Fix some integer type and calculation 826e9c91a203 usb: gadget: fsl_qe_udc: validate endpoint index for ch9 udc bbc9c3652708 usb: cdns3: Put the cdns set active part outside the spin lock 96a0bf5827e7 media: pci: cx23885: replace BUG with error return 257092cb544c media: tuners: qt1010: replace BUG_ON with a regular error b2a019ec8b33 scsi: lpfc: Abort outstanding ELS cmds when mailbox timeout error is detected dfcd3c010209 media: dvb-usb-v2: gl861: Fix null-ptr-deref in gl861_i2c_master_xfer 6ab7ea4e17d6 media: az6007: Fix null-ptr-deref in az6007_i2c_xfer() 14b94154a723 media: anysee: fix null-ptr-deref in anysee_master_xfer abb6fd93e05e media: af9005: Fix null-ptr-deref in af9005_i2c_xfer 08dfcbd03b2b media: dw2102: Fix null-ptr-deref in dw2102_i2c_transfer() 0143f282b15f media: dvb-usb-v2: af9035: Fix null-ptr-deref in af9035_i2c_master_xfer 8ba9d91c8f21 media: mdp3: Fix resource leaks in of_find_device_by_node b78796126f80 PCI: fu740: Set the number of MSI vectors 9318c3ae155b PCI: vmd: Disable bridge window for domain reset 96f27ff73220 powerpc/pseries: fix possible memory leak in ibmebus_bus_init() ee378f45a70d ARM: 9317/1: kexec: Make smp stop calls asynchronous 09066c19d945 PCI: dwc: Provide deinit callback for i.MX 4de3a603010e jfs: fix invalid free of JFS_IP(ipimap)->i_imap in diUnmount 2f7a36448f51 fs/jfs: prevent double-free in dbUnmount() after failed jfs_remount() 035bc86fbf2b ext2: fix datatype of block number in ext2_xattr_set2() 4f7d853b4590 md: raid1: fix potential OOB in raid1_remove_disk() 4e547968a6e4 bus: ti-sysc: Configure uart quirks for k3 SoC 4c743c1dd2ee drm/mediatek: dp: Change logging to dev for mtk_dp_aux_transfer() edddbdb8122e drm/exynos: fix a possible null-pointer dereference due to data race in exynos_drm_crtc_atomic_disable() a101b1bdd24a drm/amd/display: Blocking invalid 420 modes on HDMI TMDS for DCN314 2c0f5b6972eb drm/amd/display: Blocking invalid 420 modes on HDMI TMDS for DCN31 506d2ee72af2 drm/amd/display: Use DTBCLK as refclk instead of DPREFCLK 2d027da82a96 ALSA: hda: intel-dsp-cfg: add LunarLake support cc4553c14fbb ASoC: Intel: sof_sdw: Update BT offload config for soundwire config d843bcc7adc9 ASoC: SOF: topology: simplify code to prevent static analysis warnings 2ec715bf8816 drm/amd/display: Fix underflow issue on 175hz timing 4630c27c5529 samples/hw_breakpoint: Fix kernel BUG 'invalid opcode: 0000' 306c7903de14 arm64: dts: qcom: sm8250-edo: correct ramoops pmsg-size 41ff904a7c46 arm64: dts: qcom: sm8150-kumano: correct ramoops pmsg-size 23f9d0c67199 arm64: dts: qcom: sm6350: correct ramoops pmsg-size 03499a685773 arm64: dts: qcom: sm6125-pdx201: correct ramoops pmsg-size 766cc11e854e drm/edid: Add quirk for OSVR HDK 2.0 8178dac6ee2c drm/bridge: tc358762: Instruct DSI host to generate HSE packets d5feaef143b6 libbpf: Free btf_vmlinux when closing bpf_object b9a175e3b250 wifi: mac80211_hwsim: drop short frames 7e1cda5cf07f wifi: mac80211: check for station first in client probe d7b0fe3487d2 wifi: cfg80211: ocb: don't leave if not joined 676a42341013 wifi: cfg80211: reject auth/assoc to AP with our address 28b07e30bc14 netfilter: ebtables: fix fortify warnings in size_entry_mwt() 7ae7a1378a11 wifi: mac80211: check S1G action frame size 1c27b73ffa90 alx: fix OOB-read compiler warning a13c1f6c324a mmc: sdhci-esdhc-imx: improve ESDHC_FLAG_ERR010450 b62e8838e988 tpm_tis: Resend command to recover from data transfer errors c2b226f223fb netlink: convert nlk->flags to atomic flags 06e2b5ad72b6 Bluetooth: Fix hci_suspend_sync crash d3ad023a39f1 crypto: lib/mpi - avoid null pointer deref in mpi_cmp_ui() e5d94c98a72f net/ipv4: return the real errno instead of -EINVAL d5372a1f0cdf net: Use sockaddr_storage for getsockopt(SO_PEERNAME). ab0ae0af0a2d can: sun4i_can: Add support for the Allwinner D1 4eb79abf910a can: sun4i_can: Add acceptance register quirk f04b40cb70a5 wifi: wil6210: fix fortify warnings 5c8bbb79c7cb mt76: mt7921: don't assume adequate headroom for SDIO headers 4f621fe1acac wifi: mwifiex: fix fortify warning 2640a8e54f84 wifi: ath9k: fix printk specifier 1800a27a3dba wifi: ath9k: fix fortify warnings 5760a72b3060 ice: Don't tx before switchdev is fully configured ad58d7ebbf93 crypto: lrw,xts - Replace strlcpy with strscpy ac70101e5b94 devlink: remove reload failed checks in params get/set callbacks a0300edca5df selftests/nolibc: fix up kernel parameters support 1ea7e4780727 ACPI: x86: s2idle: Catch multiple ACPI_TYPE_PACKAGE objects dc1d81ee9312 hw_breakpoint: fix single-stepping when using bpf_overflow_handler d42d342d3132 perf/imx_ddr: speed up overflow frequency of cycle 9d9b5cbc12f4 perf/smmuv3: Enable HiSilicon Erratum 162001900 quirk for HIP08/09 4cb0612cf260 ACPI: video: Add backlight=native DMI quirk for Lenovo Ideapad Z470 9f10b4eb1b21 scftorture: Forgive memory-allocation failure if KASAN 83ed0cdb6ae0 rcuscale: Move rcu_scale_writer() schedule_timeout_uninterruptible() to _idle() 3b1107abdc2c kernel/fork: beware of __put_task_struct() calling context e1f686930ee4 ACPICA: Add AML_NO_OPERAND_RESOLVE flag to Timer 34bff6d85001 locks: fix KASAN: use-after-free in trace_event_raw_event_filelock_lock 28062cd6eda0 btrfs: output extra debug info if we failed to find an inline backref 726deae613bc autofs: fix memory leak of waitqueues in autofs_catatonic_mode a356197db198 Linux 6.1.54 77b49370a261 drm/amd/display: Fix a bug when searching for insert_above_mpcc 3ce9925584c6 MIPS: Only fiddle with CHECKFLAGS if `need-compiler' e5b28ce127a6 kcm: Fix error handling for SOCK_DGRAM in kcm_sendmsg(). a47db2caae27 ixgbe: fix timestamp configuration code 6f0d85d501ab tcp: Fix bind() regression for v4-mapped-v6 non-wildcard address. 63830afece93 tcp: Fix bind() regression for v4-mapped-v6 wildcard address. 489ced24c7ca tcp: Factorise sk_family-independent comparison in inet_bind2_bucket_match(_addr_any). 82f9af464e01 ipv6: Remove in6addr_any alternatives. 8b6556c4c4e3 ipv6: fix ip6_sock_set_addr_preferences() typo d5d315cf7687 net: macb: fix sleep inside spinlock 7aa720c350c7 net: macb: Enable PTP unicast 7f4116c6f984 net/tls: do not free tls_rec on async operation in bpf_exec_tx_verdict() f72497c521c9 platform/mellanox: NVSW_SN2201 should depend on ACPI 9d392695f323 platform/mellanox: mlxbf-pmc: Fix reading of unprogrammed events 3f16330a4869 platform/mellanox: mlxbf-pmc: Fix potential buffer overflows 3a45dcfb4d3c platform/mellanox: mlxbf-tmfifo: Drop jumbo frames 30c8bbe1edba platform/mellanox: mlxbf-tmfifo: Drop the Rx packet if no more descriptors 16989de75497 kcm: Fix memory leak in error path of kcm_sendmsg() 2323397e5877 r8152: check budget for r8152_poll() 44c8ffd482cc net: dsa: sja1105: block FDB accesses that are concurrent with a switch reset e74bd1b229cb net: dsa: sja1105: serialize sja1105_port_mcast_flood() with other FDB accesses d766cf9ddb97 net: dsa: sja1105: fix multicast forwarding working only for last added mdb entry 538e7fe66c46 net: dsa: sja1105: propagate exact error code from sja1105_dynamic_config_poll_valid() 9a3e7eca2b5b net: dsa: sja1105: hide all multicast addresses from "bridge fdb show" 66e79c2f3a93 net:ethernet:adi:adin1110: Fix forwarding offload c281948cebcc net: ethernet: adi: adin1110: use eth_broadcast_addr() to assign broadcast address 61866f7d814e hsr: Fix uninit-value access in fill_frame_info() ff5faed5f548 net: ethernet: mtk_eth_soc: fix possible NULL pointer dereference in mtk_hwlro_get_fdir_all() 349638f7e5d3 net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc() 9dbbc87d5b61 net: stmmac: fix handling of zero coalescing tx-usecs 70c8d17007dc net/smc: use smc_lgr_list.lock to protect smc_lgr_list.list iterate in smcr_port_add ef5d546b9d4f selftests: Keep symlinks, when possible cdd61a27fb0a kselftest/runner.sh: Propagate SIGTERM to runner child 980f84454798 net: ipv4: fix one memleak in __inet_del_ifa() 9acb294ebdfe kunit: Fix wild-memory-access bug in kunit_free_suite_set() cb30ff2adb10 drm/amdgpu: register a dirty framebuffer callback for fbcon b53fee19ec5e drm/amd/display: Remove wait while locked 2d7a6fcb1f23 drm/amd/display: always switch off ODM before committing more streams c29bfda64b44 perf hists browser: Fix the number of entries for 'e' key f4618f131629 perf tools: Handle old data in PERF_RECORD_ATTR be69e8c8f5c2 perf test shell stat_bpf_counters: Fix test on Intel cb0940640d51 perf hists browser: Fix hierarchy mode header ec5409612255 MIPS: Fix CONFIG_CPU_DADDI_WORKAROUNDS `modules_install' regression 60b5ef4cf82c KVM: SVM: Skip VMSA init in sev_es_init_vmcb() if pointer is NULL 12645e623f28 KVM: SVM: Set target pCPU during IRTE update if target vCPU is running 5b2b0535fa7a KVM: nSVM: Load L1's TSC multiplier based on L1 state, not L2 state 6c1ecfea1daf KVM: nSVM: Check instead of asserting on nested TSC scaling support 5c18ace750e4 KVM: SVM: Get source vCPUs from source VM for SEV-ES intrahost migration ba82001e4118 KVM: SVM: Don't inject #UD if KVM attempts to skip SEV guest insn 3988692acc92 KVM: SVM: Take and hold ir_list_lock when updating vCPU's Physical ID entry ff536a96687c drm/amd/display: prevent potential division by zero errors e1769b1dfcae drm/amd/display: enable cursor degamma for DCN3+ DRM legacy gamma 3388ca3a38a5 mtd: rawnand: brcmnand: Fix ECC level field setting for v7.2 controller 31d42146fa6f mtd: rawnand: brcmnand: Fix potential false time out warning 7c6ba20a0b9a mtd: spi-nor: Correct flags for Winbond w25q128 45fe4ad7f439 mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write a7e118fcc8b4 mtd: rawnand: brcmnand: Fix crash during the panic_write 8bf2d4ca521d drm/mxsfb: Disable overlay plane in mxsfb_plane_overlay_atomic_disable() 09974a1352d3 btrfs: use the correct superblock to compare fsid in btrfs_validate_super b692f7d1576b btrfs: zoned: re-enable metadata over-commit for zoned mode 08daa38ca212 btrfs: set page extent mapped after read_folio in relocate_one_page 91f6a538d625 btrfs: don't start transaction when joining with TRANS_JOIN_NOSTART f933a1c43b68 btrfs: free qgroup rsv on io failure cdc3ba292df8 btrfs: fix start transaction qgroup rsv double free 59c38f050d9b btrfs: zoned: do not zone finish data relocation block group ef819c2f8e8a fuse: nlookup missing decrement in fuse_direntplus_link 6694be119f63 ata: pata_ftide010: Add missing MODULE_DESCRIPTION ae73b94ad771 ata: sata_gemini: Add missing MODULE_DESCRIPTION 1605f2709017 ata: pata_falcon: fix IO base selection for Q40 cdd0d707357c ata: ahci: Add Elkhart Lake AHCI controller e93bc372dbc0 hwspinlock: qcom: add missing regmap config for SFPB MMIO implementation 0649dc0af93a lib: test_scanf: Add explicit type cast to result initialization in test_number_prefix() 980b592c6087 f2fs: avoid false alarm of circular locking 1c64dbe8fa35 f2fs: flush inode if atomic file is aborted 1fb3f1bbfdb5 ext4: fix memory leaks in ext4_fname_{setup_filename,prepare_lookup} 03393857a95b ext4: add correct group descriptors and reserved GDT blocks to system zone 20108975ec51 jbd2: correct the end of the journal recovery scan range dbafe636db41 jbd2: check 'jh->b_transaction' before removing it from checkpoint c5f23305f8b1 jbd2: fix checkpoint cleanup performance regression 6ea18981bb8a dmaengine: sh: rz-dmac: Fix destination and source data size setting de43bc17987d clocksource/drivers/arm_arch_timer: Disable timer before programming CVAL f2953184bf19 ARC: atomics: Add compiler barrier to atomic operations... 8eea0afbcc9d net/mlx5: Free IRQ rmap and notifier on kernel shutdown 017a05805368 Multi-gen LRU: avoid race in inc_min_seq() 69561478400c sh: boards: Fix CEU buffer size passed to dma_declare_coherent_memory() 9cd5cf0bfeaf net: hns3: remove GSO partial feature bit 136806771864 net: hns3: fix the port information display when sfp is absent 9bd9afd55c52 net: hns3: fix invalid mutex between tc qdisc and dcb ets command issue d76436e26943 net: hns3: fix debugfs concurrency issue between kfree buffer and read b5087697130a net: hns3: fix byte order conversion issue in hclge_dbg_fd_tcam_read() 5c28780f4232 net: hns3: fix tx timeout issue 7bb8d52b4271 netfilter: nfnetlink_osf: avoid OOB read d9ebfc0f2137 netfilter: nftables: exthdr: fix 4-byte stack OOB write 6cf0d1d5a50b bpf: Assign bpf_tramp_run_ctx::saved_run_ctx before recursion check. 04f92e67b35d bpf: Invoke __bpf_prog_exit_sleepable_recur() on recursion in kern_sys_bpf(). a12f15d1f863 bpf: Remove prog->active check for bpf_lsm and bpf_iter 5f09b79e99ad net: dsa: sja1105: complete tc-cbs offload support on SJA1110 ec9f203ad7f3 net: dsa: sja1105: fix -ENOSPC when replacing the same tc-cbs too many times 483f0e3975df net: dsa: sja1105: fix bandwidth discrepancy between tc-cbs software and offload 54b59bc18d19 ip_tunnels: use DEV_STATS_INC() 175f290dc937 idr: fix param name in idr_alloc_cyclic() doc 147d8da33a2c s390/zcrypt: don't leak memory if dev_set_name() fails ccb048dae8ff igb: Change IGB_MIN to allow set rx/tx value between 64 and 80 74b98c61c9c6 igbvf: Change IGBVF_MIN to allow set rx/tx value between 64 and 80 30acc4f954a0 igc: Change IGC_MIN to allow set rx/tx value between 64 and 80 e2e2c839d827 octeontx2-af: Fix truncation of smq in CN10K NIX AQ enqueue mbox handler e30388b80d23 kcm: Destroy mutex in kcm_exit_net() a18349dc8d91 net: sched: sch_qfq: Fix UAF in qfq_dequeue() 2100bbf55e56 af_unix: Fix data race around sk->sk_err. ce3aa88ceccd af_unix: Fix data-races around sk->sk_shutdown. 2d8933ca863e af_unix: Fix data-race around unix_tot_inflight. b9cdbb38e030 af_unix: Fix data-races around user->unix_inflight. 923877254f00 bpf, sockmap: Fix skb refcnt race after locking changes 71fb38b222cf net: phy: micrel: Correct bit assignments for phy_device flags aa8fd3a63691 net: ipv6/addrconf: avoid integer underflow in ipv6_create_tempaddr e752860bbc3c veth: Fixing transmit return status for dropped packets a47ad6d226dc gve: fix frag_list chaining 24b1e835db34 igb: disable virtualization features on 82580 7ddfe350e255 ipv6: ignore dst hint for multipath routes 0b2ee66411fe ipv4: ignore dst hint for multipath routes b7d25ac3627a mptcp: annotate data-races around msk->rmem_fwd_alloc 787c5829681b net: annotate data-races around sk->sk_forward_alloc f1175881ddd9 net: use sk_forward_alloc_get() in sk_get_meminfo() bd9bd085c681 drm/i915/gvt: Drop unused helper intel_vgpu_reset_gtt() 2b7510bb92c1 drm/i915/gvt: Put the page reference obtained by KVM's gfn_to_pfn() f5738399ed96 drm/i915/gvt: Verify pfn is "valid" before dereferencing "struct page" 6436973164ea xsk: Fix xsk_diag use-after-free error during socket cleanup d92c34348b37 net: fib: avoid warn splat in flow dissector 9036b6342fcd net: read sk->sk_family once in sk_mc_loop() 5aaa7ee23203 ipv4: annotate data-races around fi->fib_dead 471f534971d9 sctp: annotate data-races around sk->sk_wmem_queued f39b49077abe net/sched: fq_pie: avoid stalls in fq_pie_timer() 47f72ee50226 smb: propagate error code of extract_sharename() 60e3318e3e90 cifs: use fs_context for automounts 84d577923450 blk-throttle: consider 'carryover_ios/bytes' in throtl_trim_slice() fd2420905c8e blk-throttle: use calculate_io/bytes_allowed() for throtl_trim_slice() 8017a27cec32 drm/i915: mark requests for GuC virtual engines to avoid use-after-free 0686336f7383 perf test stat_bpf_counters_cgrp: Enhance perf stat cgroup BPF counter test 66b23e7b0822 perf test stat_bpf_counters_cgrp: Fix shellcheck issue about logical operators 523f6268e865 pwm: lpc32xx: Remove handling of PWM channels fa5392873639 watchdog: intel-mid_wdt: add MODULE_ALIAS() to allow auto-load 032cd8ce89a4 perf top: Don't pass an ERR_PTR() directly to perf_session__delete() adeb9f392d07 perf vendor events: Drop STORES_PER_INST metric event for power10 platform 6ade9094b477 perf vendor events: Drop some of the JSON/events for power10 platform b7cbcafb6d04 perf vendor events: Update the JSON/events descriptions for power10 platform 6a43e0d62311 x86/virt: Drop unnecessary check on extended CPUID level in cpu_has_svm() 6522397e7502 perf annotate bpf: Don't enclose non-debug code with an assert() e62e740009cc Input: tca6416-keypad - fix interrupt enable disbalance a7345501a3bd Input: tca6416-keypad - always expect proper IRQ number in i2c client d7add2001991 backlight: gpio_backlight: Drop output GPIO direction check for initial power state 9de7eb95bbe8 pwm: atmel-tcb: Fix resource freeing in error path and remove c42256a283d6 pwm: atmel-tcb: Harmonize resource allocation order b9734e8505bd pwm: atmel-tcb: Convert to platform remove callback returning void 62dd514c34be perf trace: Really free the evsel->priv area e5dee8222d7c perf trace: Use zfree() to reduce chances of use after free eb17c3d0055b Input: iqs7222 - configure power mode before triggering ATI 8ab594223950 kconfig: fix possible buffer overflow 39c29d075352 mailbox: qcom-ipcc: fix incorrect num_chans counting 36201d559b47 gfs2: low-memory forced flush fixes 694e43f22c5b gfs2: Switch to wait_event in gfs2_logd c4807163e2d4 tpm_crb: Fix an error handling path in crb_acpi_add() 46d3bc902b03 kbuild: do not run depmod for 'make modules_sign' 390275d7a863 kbuild: rpm-pkg: define _arch conditionally 31cf7853a940 net: deal with integer overflows in kmalloc_reserve() 2b39866f0a38 net: factorize code in kmalloc_reserve() 36974c3a5438 net: remove osize variable in __alloc_skb() 5f7676fdaf42 net: add SKB_HEAD_ALIGN() helper 8b4d0f3890c8 bus: mhi: host: Skip MHI reset if device is in RDDM fd9a8ad2cfa7 NFSv4/pnfs: minor fix for cleanup path in nfs4_get_device_info dac14a1dbe20 NFS: Fix a potential data corruption 1bb9546c7aed clk: qcom: mss-sc7180: fix missing resume during probe 017e60a215d8 clk: qcom: q6sstop-qcs404: fix missing resume during probe eab2ece5e4b5 clk: qcom: lpasscc-sc7280: fix missing resume during probe 5310f712157a clk: qcom: dispcc-sm8450: fix runtime PM imbalance on probe errors f6250ecb7fbb soc: qcom: qmi_encdec: Restrict string length in decode c4e1204bd714 clk: qcom: gcc-mdm9615: use proper parent for pll0_vote clock 5b3b0f7f7363 clk: imx: pll14xx: align pdiv with reference manual 871244f8efe8 clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz 311db21d4a1f dt-bindings: clock: xlnx,versal-clk: drop select:false 54e5ff4af78b pinctrl: cherryview: fix address_space_handler() argument 9c8fc05bd4d0 cifs: update desired access while requesting for directory lease db5d5673ab7e parisc: led: Reduce CPU overhead for disk & lan LED computation ff2c44f0118d parisc: led: Fix LAN receive and transmit LEDs 421855d0d24d lib/test_meminit: allocate pages up to order MAX_ORDER 84a212a72c84 mm: hugetlb_vmemmap: fix a race between vmemmap pmd split 21ef9e11205f memcg: drop kmem.limit_in_bytes 0f7339056893 send channel sequence number in SMB3 requests after reconnects 22ec50d7b524 arm64: dts: renesas: rzg2l: Fix txdv-skew-psec typos df2d596e7e9c clk: qcom: turingcc-qcs404: fix missing resume during probe b83ae66d8265 ASoC: tegra: Fix SFC conversion for few rates 3c9881fd220a drm/ast: Fix DRAM init on AST2200 c0341bddd6cc clk: qcom: camcc-sc7180: fix async resume during probe f83c1b13f815 fbdev/ep93xx-fb: Do not assign to struct fb_info.dev a0b4a0666bea null_blk: fix poll request timeout handling f55797084931 scsi: qla2xxx: Fix firmware resource tracking 3a9d4db2d2e0 scsi: qla2xxx: Error code did not return to upper layer c7355cbb9c1b scsi: qla2xxx: Fix smatch warn for qla_init_iocb_limit() 974887e1d689 scsi: qla2xxx: Flush mailbox commands on chip reset 98643561d853 scsi: qla2xxx: Remove unsupported ql2xenabledif option 1f0e3814adc7 scsi: qla2xxx: Fix TMF leak through e6aabf0654cc scsi: qla2xxx: Fix session hang in gnl addaa136f10b scsi: qla2xxx: Turn off noisy message log 01e3440ce021 scsi: qla2xxx: Fix erroneous link up failure ddb8fa05981c scsi: qla2xxx: Fix command flush during TMF 6e44a7e2a0bc scsi: qla2xxx: fix inconsistent TMF timeout cd06c45b326e scsi: qla2xxx: Fix deletion race condition 820010cfe5f8 scsi: qla2xxx: Limit TMF to 8 per function faf7e224b4fa scsi: qla2xxx: Adjust IOCB resource on qpair create 98d3e7c5f757 drm/virtio: Conditionally allocate virtio_gpu_fence 3e8b9b06de9d io_uring: Don't set affinity on a dying sqpoll thread 9704cfcf1fa9 io_uring/sqpoll: fix io-wq affinity when IORING_SETUP_SQPOLL is used 605d055452e7 io_uring: break out of iowq iopoll on teardown b04f22b68643 io_uring/net: don't overflow multishot accept 5afbf7fdb730 io_uring: revert "io_uring fix multishot accept ordering" fd459200ff81 io_uring: always lock in io_apoll_task_func f36791596176 Multi-gen LRU: fix per-zone reclaim a73d04c46052 mm: multi-gen LRU: rename lrugen->lists[] to lrugen->folios[] 7164d74aae1c net/ipv6: SKB symmetric hash should incorporate transport ports Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit d7efd25c9e6efa4adcc1646e36c2d6fe444f6e28) Signed-off-by: Steve Sakoman --- .../linux/cve-exclusion_6.1.inc | 13 +++++---- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc index 173bff2813..b6b9ca00d4 100644 --- a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc +++ b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc @@ -1,9 +1,9 @@ # Auto-generated CVE metadata, DO NOT EDIT BY HAND. -# Generated at 2023-10-09 16:39:52.745283+00:00 for version 6.1.53 +# Generated at 2023-09-30 07:26:16.988526+00:00 for version 6.1.55 python check_kernel_cve_status_version() { - this_version = "6.1.53" + this_version = "6.1.55" kernel_version = d.getVar("LINUX_VERSION") if kernel_version != this_version: bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) @@ -7297,7 +7297,8 @@ CVE_CHECK_IGNORE += "CVE-2023-42752" # cpe-stable-backport: Backported in 6.1.53 CVE_CHECK_IGNORE += "CVE-2023-42753" -# CVE-2023-42755 needs backporting (fixed from 6.1.55) +# cpe-stable-backport: Backported in 6.1.55 +CVE_CHECK_IGNORE += "CVE-2023-42755" # fixed-version: Fixed from version 5.19rc1 CVE_CHECK_IGNORE += "CVE-2023-4385" @@ -7327,9 +7328,11 @@ CVE_CHECK_IGNORE += "CVE-2023-4611" # cpe-stable-backport: Backported in 6.1.53 CVE_CHECK_IGNORE += "CVE-2023-4623" -# CVE-2023-4881 needs backporting (fixed from 6.1.54) +# cpe-stable-backport: Backported in 6.1.54 +CVE_CHECK_IGNORE += "CVE-2023-4881" -# CVE-2023-4921 needs backporting (fixed from 6.1.54) +# cpe-stable-backport: Backported in 6.1.54 +CVE_CHECK_IGNORE += "CVE-2023-4921" # CVE-2023-5158 has no known resolution diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index 9e94fc5255..a56addd4d5 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "af2faa46d440ee11170ba8233eec0f818988f256" -SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc" +SRCREV_machine ?= "4b3040c1dc13aaac356ad4ef45a8926118c732d0" +SRCREV_meta ?= "943c6fe5dac329c7e1c30d602788f409e692b3a8" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.53" +LINUX_VERSION ?= "6.1.55" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 04ae601e69..cb94d2d28e 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.53" +LINUX_VERSION ?= "6.1.55" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" -SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc" +SRCREV_machine ?= "644e73fa089ade30c0db7bd54be960be92546ba2" +SRCREV_meta ?= "943c6fe5dac329c7e1c30d602788f409e692b3a8" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 567e0154bd..ef451efea5 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "b11af7d1c8b4337347747977173c878e7672eb15" -SRCREV_machine:qemuarm64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" -SRCREV_machine:qemuloongarch64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" -SRCREV_machine:qemumips ?= "81af09853cc4318fad59e780c830c9cc8ccdc898" -SRCREV_machine:qemuppc ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" -SRCREV_machine:qemuriscv64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" -SRCREV_machine:qemuriscv32 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" -SRCREV_machine:qemux86 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" -SRCREV_machine:qemux86-64 ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" -SRCREV_machine:qemumips64 ?= "6ec5ef2f6fa90a5823e131805845738453bc553a" -SRCREV_machine ?= "51f0e0b74445fb47b6544b26667f9d58b2017695" -SRCREV_meta ?= "59e0fce122a66f7dcaf7a2a8294d81c4b78197dc" +SRCREV_machine:qemuarm ?= "cf771f6d6bc0344e048bdbf7d23d3aacbe3556d0" +SRCREV_machine:qemuarm64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" +SRCREV_machine:qemuloongarch64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" +SRCREV_machine:qemumips ?= "4be1dcc270e6ddeea513af01d91ea3b48ec82470" +SRCREV_machine:qemuppc ?= "644e73fa089ade30c0db7bd54be960be92546ba2" +SRCREV_machine:qemuriscv64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" +SRCREV_machine:qemuriscv32 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" +SRCREV_machine:qemux86 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" +SRCREV_machine:qemux86-64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" +SRCREV_machine:qemumips64 ?= "aa0e978c979b84d620ad21132cfdbbf857be3878" +SRCREV_machine ?= "644e73fa089ade30c0db7bd54be960be92546ba2" +SRCREV_meta ?= "943c6fe5dac329c7e1c30d602788f409e692b3a8" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "09045dae0d902f9f78901a26c7ff1714976a38f9" +SRCREV_machine:class-devupstream ?= "d23900f974e0fb995b36ef47283a5aa74ca25f51" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" @@ -43,7 +43,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.53" +LINUX_VERSION ?= "6.1.55" PV = "${LINUX_VERSION}+git${SRCPV}" From patchwork Fri Oct 20 15:51:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32671 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 80199C001DF for ; Fri, 20 Oct 2023 15:51:59 +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.web11.58033.1697817110073101001 for ; Fri, 20 Oct 2023 08:51:50 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=gu8tnTUV; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1cacde97002so3806325ad.2 for ; Fri, 20 Oct 2023 08:51:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817109; x=1698421909; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=+SSUnvDQ1KoT8DV3XaTadYUR+8rEXBbHTPCAJLxiWVA=; b=gu8tnTUVCLEL44zBu38JQjsAnC9h5OUCGE4qq4hXy687b3CA95LbJkzdmZ1Qeq5R6z JGcEPZOrOFTH/6aoeJX5+PIpENDc5w7ieLrp8nY1v6ZRmeanGlI3Zd/ndRRIEUXucB5S RtObYqAzrBfGyBX4z8uL/r5rj6qAfomS8syTe1hywA6IBXuDjiQGUbuHVvWD1iHx8vNN 4DWfnElgO57OHyc7t313ncskwJhaeM/su+fscGaycb8QtLYVeeGvoNw9FBRwoMaL9FrS YC60DD332sRC2by3AtocpjyV1DJIrlzVHlKHvt7yC/lfPH58UJfPGNWxJTKj4MUt8c/W M7yw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817109; x=1698421909; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+SSUnvDQ1KoT8DV3XaTadYUR+8rEXBbHTPCAJLxiWVA=; b=J9Rapf0uIfMknNao+NQ+FhncJPfeW/OHqoq/XVkn+4qygmYhCBSMjENa4F3oIMrll3 84uVA80ppVE/7C5CCVEE6TC+61eWN8hkyFGJS/8hYwNettdIHj7EsavhyQRc/g76Ke9x VghW9wjbYSl7LOKMYBpn30nZQC9BDFeIhD+jLLixptE2CatU4EjJ/5myayWPslNzreQB uDGAUYYcDwDUG4nnqyD8Q5h0YG57Ef66x1qD7hL0HfCzpKs6lUHdOzGMMUvYer46jhLg b/rQNjPxwMU6LxyFIuMbiDojd0XRtXjGzua84DWWFdWZp1Y8Ffi72wZmI+POIAwWDcXK HgNQ== X-Gm-Message-State: AOJu0YyhzSg2BgC/wmJMQ0kWuv9v7zME8iMO0Q1bGZSK10B6lbpxpvjb hJ5dpeX3UoVLC13ZKkCQSOlmI4UneOMn/Y9tUVY= X-Google-Smtp-Source: AGHT+IH1pKmtrx6C/7ZJgVla/lKKiexLRPfAFuVnmVqssdBFRYVp7WxpzgnvVQthcGx1URnRzxZLTA== X-Received: by 2002:a17:902:f7cd:b0:1ca:86a9:cace with SMTP id h13-20020a170902f7cd00b001ca86a9cacemr2263381plw.2.1697817108803; Fri, 20 Oct 2023 08:51:48 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:48 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 09/24] linux-yocto/6.1: update to v6.1.56 Date: Fri, 20 Oct 2023 05:51:11 -1000 Message-Id: X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189554 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: ecda77b46871 Linux 6.1.56 8c515d4f2d66 ASoC: amd: yc: Fix a non-functional mic on Lenovo 82TL a3c1da448353 mm, memcg: reconsider kmem.limit_in_bytes deprecation b8901b6c2e9b memcg: drop kmem.limit_in_bytes ee335e0094ad drm/meson: fix memory leak on ->hpd_notify callback b60028c81e46 drm/amdkfd: Use gpu_offset for user queue's wptr 48a22f13fb1b fs: binfmt_elf_efpic: fix personality for ELF-FDPIC 69e61ee8ea8a power: supply: ab8500: Set typing and props c038ebffbb48 power: supply: rk817: Add missing module alias 69dd84470b4d drm/i915/gt: Fix reservation address in ggtt_reserve_guc_top 60d2e06ad6e3 ata: libata-sata: increase PMP SRST timeout to 10s 886f387db1e6 ata: libata-core: Do not register PM operations for SAS ports 5cfbe6da8354 ata: libata-core: Fix port and device removal 0b7aaf2058ba ata: libata-core: Fix ata_port_request_pm() locking f555a508087a fs/smb/client: Reset password pointer to NULL 1983fd78701a net: thunderbolt: Fix TCPv6 GSO checksum calculation 4fb56e82d939 bpf: Fix BTF_ID symbol generation collision in tools/ 4f1e3e02777b bpf: Fix BTF_ID symbol generation collision b1041cab4726 bpf: Add override check to kprobe multi link attach 09635bf4cdd4 media: uvcvideo: Fix OOB read d6a749e4cab2 btrfs: properly report 0 avail for very full file systems f3ad8874541d ring-buffer: Update "shortest_full" in polling 6bacdb914a99 mm: memcontrol: fix GFP_NOFS recursion in memory.high enforcement a5569bb18752 mm/slab_common: fix slab_caches list corruption after kmem_cache_destroy() 9a4fe81a8644 mm/damon/vaddr-test: fix memory leak in damon_do_test_apply_three_regions() 68a63a077e02 arm64: defconfig: remove CONFIG_COMMON_CLK_NPCM8XX=y b29756aefe03 drm/tests: Fix incorrect argument in drm_test_mm_insert_range a90eafbf165f timers: Tag (hr)timer softirq as hotplug safe f32340c70eb9 Revert "SUNRPC dont update timeout value on connection reset" 1e4c03d530d8 netfilter: nf_tables: fix kdoc warnings after gc rework 49903f70d728 sched/rt: Fix live lock between select_fallback_rq() and RT push 787256ec9b44 kernel/sched: Modify initial boot task idle setup afa2bbd682c7 ASoC: amd: yc: Fix non-functional mic on Lenovo 82QF and 82UG 829ff08be566 i2c: i801: unregister tco_pdev in i801_probe() error path 75c307d9f2fb io_uring/fs: remove sqe->rw_flags checking from LINKAT 06fba8a8dea2 ata: libata-scsi: ignore reserved bits for REPORT SUPPORTED OPERATION CODES 476fd029e700 ata: libata-scsi: link ata port and scsi device 490f3b805ee3 LoongArch: numa: Fix high_memory calculation 7bc8585aa071 LoongArch: Define relocation types for ABI v2.10 f04ded9ae268 ALSA: hda: Disable power save for solving pop issue on Lenovo ThinkCentre M70q 9af8bb2afea3 netfilter: nf_tables: disallow rule removal from chain binding 980663f1d189 nilfs2: fix potential use after free in nilfs_gccache_submit_read_data() e14f68a48fd4 serial: 8250_port: Check IRQ data before use c61d0b87a702 Revert "tty: n_gsm: fix UAF in gsm_cleanup_mux" 37435ddfadc6 misc: rtsx: Fix some platforms can not boot and move the l1ss judgment to probe 5d6613ed2b7d mptcp: fix bogus receive window shrinkage with multiple subflows 00c27bffdba6 KVM: x86/mmu: Do not filter address spaces in for_each_tdp_mmu_root_yield_safe() cd41db6cb285 KVM: x86/mmu: Open code leaf invalidation from mmu_notifier 733d7a5451fc KVM: SVM: Fix TSC_AUX virtualization setup e86a3a622633 KVM: SVM: INTERCEPT_RDTSCP is never intercepted anyway 6ce2f297a716 x86/srso: Add SRSO mitigation for Hygon processors 811ba2ef0cb6 x86/sgx: Resolves SECS reclaim vs. page fault for EAUG race f90f4c562003 iommu/arm-smmu-v3: Fix soft lockup triggered by arm_smmu_mm_invalidate_range a09446ac0414 smack: Retrieve transmuting information in smack_inode_getsecurity() cbb16d0f4996 smack: Record transmuting in smk_transmuted 4b8ef68e39d2 nvme-pci: always return an ERR_PTR from nvme_pci_alloc_dev 1d7bc76b5849 scsi: qla2xxx: Fix NULL pointer dereference in target mode 1a51d35ba729 wifi: ath11k: Don't drop tx_status when peer cannot be found a60768c05b58 nvme-pci: do not set the NUMA node of device if it has none 6b2165cae403 nvme-pci: factor out a nvme_pci_alloc_dev helper 69bc295d0e0b nvme-pci: factor the iod mempool creation into a helper 9ebee88a8911 perf build: Define YYNOMEM as YYNOABORT for bison < 3.81 8e85af2c682e fbdev/sh7760fb: Depend on FB=y f105e893a8ed LoongArch: Set all reserved memblocks on Node#0 at initialization 146ba159f5a6 tsnep: Fix NAPI polling with budget 0 78ac1e7dec24 tsnep: Fix NAPI scheduling b09c1359e4f0 net: hsr: Add __packed to struct hsr_sup_tlv. 97788f0757bd ncsi: Propagate carrier gain/loss events to the NCSI controller c93aa8cfaec4 powerpc/watchpoints: Annotate atomic context in more places 3632e9fd82d0 powerpc/watchpoint: Disable pagefaults when getting user instruction 16722418cbe3 powerpc/watchpoints: Disable preemption in thread_change_pc() ee8bbb2a31d3 ASoC: SOF: Intel: MTL: Reduce the DSP init timeout 3608be186ae5 NFSv4.1: fix zero value filehandle in post open getattr e9f05ae6f636 media: vb2: frame_vector.c: replace WARN_ONCE with a comment 28c369324922 ASoC: imx-rpmsg: Set ignore_pmdown_time for dai_link 1c88886587d3 memblock tests: fix warning ‘struct seq_file’ declared inside parameter list 729757fe9718 memblock tests: fix warning: "__ALIGN_KERNEL" redefined 53618d56bfe4 firmware: cirrus: cs_dsp: Only log list of algorithms in debug build 110e6f575028 ASoC: cs42l42: Don't rely on GPIOD_OUT_LOW to set RESET initially low cbc43ddd5ce2 ASoC: cs42l42: Ensure a reset pulse meets minimum pulse width. 019f01f81887 ALSA: hda: intel-sdw-acpi: Use u8 type for link index 92f24f98d5ff bpf: Clarify error expectations from bpf_clone_redirect 60446b5e7486 spi: intel-pci: Add support for Granite Rapids SPI serial flash 12716449289e ASoC: fsl: imx-pcm-rpmsg: Add SNDRV_PCM_INFO_BATCH flag 85ca138f922c spi: stm32: add a delay before SPI disable 84592ec591be spi: nxp-fspi: reset the FLSHxCR1 registers d5ae9d9f0c41 ata: libata-eh: do not clear ATA_PFLAG_EH_PENDING in ata_eh_reset() 2132ea3f9f5a smb3: correct places where ENOTSUPP is used instead of preferred EOPNOTSUPP 2259e1901b2d scsi: pm80xx: Avoid leaking tags when processing OPC_INB_SET_CONTROLLER_CONFIG command 82f575a7e811 scsi: pm80xx: Use phy-specific SAS address when sending PHY_START command 6e392ff88476 riscv: errata: fix T-Head dcache.cva encoding 91b6845ef387 drm/amdgpu: Handle null atom context in VBIOS info ioctl ad3c37f90bae drm/amdgpu/nbio4.3: set proper rmmio_remap.reg_offset for SR-IOV cca15a827907 drm/amdgpu/soc21: don't remap HDP registers for SR-IOV b9971393d4c9 drm/amd/display: Don't check registers, if using AUX BL control 49bdfc83c74a thermal/of: add missing of_node_put() d6a68f163246 platform/x86: asus-wmi: Support 2023 ROG X16 tablet mode d1f916c6eb0c platform/mellanox: mlxbf-bootctl: add NET dependency into Kconfig dfbcef80dda9 ata: sata_mv: Fix incorrect string length computation in mv_dump_mem() 797d75bd575c net/smc: bugfix for smcr v2 server connect success statistic b08a4938229d ring-buffer: Do not attempt to read past "commit" baa1634bc936 selftests: fix dependency checker script 45ad79c9cb50 btrfs: assert delayed node locked when removing delayed item 11054f0b889f ring-buffer: Avoid softlockup in ring_buffer_resize() a687e817d814 selftests/ftrace: Correctly enable event in instance-event.tc 5fb322df090e scsi: ufs: core: Poll HCS.UCRDY before issuing a UIC command 81a6cdfcfd23 scsi: ufs: core: Move __ufshcd_send_uic_cmd() outside host_lock 843348f9e4aa scsi: qedf: Add synchronization between I/O completions and abort 655e9d209c06 parisc: irq: Make irq_stack_union static to avoid sparse warning 8a2c2630e18d parisc: drivers: Fix sparse warning 60caeaf090d5 parisc: iosapic.c: Fix sparse warnings 632e0fcf409b parisc: sba: Fix compile warning wrt list of SBA devices be90c9e29dd5 nvme-fc: Prevent null pointer dereference in nvme_fc_io_getuuid() 36b29974a7ad spi: sun6i: fix race between DMA RX transfer completion and RX FIFO drain e15bb292b246 spi: sun6i: reduce DMA RX transfer width to single byte 5685f8a6fae1 bpf: Annotate bpf_long_memcpy with data_race be8f49029eca dma-debug: don't call __dma_entry_alloc_check_leak() under free_entries_lock 89744b649144 ceph: drop messages from MDS when unmounting 1375d9600c38 x86/reboot: VMCLEAR active VMCSes before emergency reboot 85fafa7ef0ac i2c: npcm7xx: Fix callback completion ordering 0d6c2f0942c3 gpio: pmic-eic-sprd: Add can_sleep flag for PMIC EIC chip e578a26084eb firmware: arm_ffa: Don't set the memory region attributes for MEM_LEND 099cfc6e5d1b arm64: dts: imx: Add imx8mm-prt8mm.dtb to build 328efccc7847 soc: imx8m: Enable OCOTP clock for imx8mm before reading registers aab681bcb13a selftests/powerpc: Fix emit_tests to work with run_kselftest.sh 763f029f8c0f selftests/powerpc: Pass make context to children b9dc3d6b761d selftests/powerpc: Use CLEAN macro to fix make warning fe6406238d5a power: supply: rk817: Fix node refcount leak 1005010b732b xtensa: boot/lib: fix function prototypes 6438653ad1f2 xtensa: umulsidi3: fix conditional expression 45661247d117 xtensa: boot: don't add include-dirs fca1b09645e5 xtensa: iss/network: make functions static b4e666fa38fd xtensa: add default definition for XCHAL_HAVE_DIV32 7cad56459964 firmware: imx-dsp: Fix an error handling path in imx_dsp_setup_channels() 33ed60d8b961 power: supply: ucs1002: fix error code in ucs1002_get_property() 1ec48a9fac7d bus: ti-sysc: Fix SYSC_QUIRK_SWSUP_SIDLE_ACT handling for uart wake-up dd19672aaac4 ARM: dts: ti: omap: motorola-mapphone: Fix abe_clkctrl warning on boot fe1379c0f61d ARM: dts: Unify pinctrl-single pin group nodes for omap4 16455bed4f86 ARM: dts: Unify pwm-omap-dmtimer node names 4ccb05618b4d ARM: dts: ti: omap: Fix bandgap thermal cells addressing for omap3/4 fe4da07a7f1b ARM: dts: omap: correct indentation ea4efaf54685 clk: tegra: fix error return case for recalc_rate efad31b6c062 clk: sprd: Fix thm_parents incorrect configuration 1ea6975aa68a power: supply: mt6370: Fix missing error code in mt6370_chg_toggle_cfo() 64adb41644fc firmware: arm_scmi: Fixup perf power-cost/microwatt support a135c8813815 firmware: arm_scmi: Harden perf domain info access 3a21635aed62 bus: ti-sysc: Fix missing AM35xx SoC matching 771eb7c3f3fb bus: ti-sysc: Use fsleep() instead of usleep_range() in sysc_reset() e6389d61b720 drm/bridge: ti-sn65dsi83: Do not generate HFP/HBP/HSA and EOT packet 404b8bc41872 spi: spi-gxp: BUG: Correct spi write return value d3dc8acb60f8 MIPS: Alchemy: only build mmc support helpers if au1xmmc is enabled c01b2e0ee22e vfio/mdev: Fix a null-ptr-deref bug for mdev_unregister_parent() cca10592ffd5 btrfs: reset destination buffer when read_extent_buffer() gets invalid range cdfcaa4e8043 drm/amdkfd: Insert missing TLB flush on GFX10 and later 9becfff9f91e drm/amdkfd: Flush TLB after unmapping for GFX v9.4.3 52c7b41ad6ee scsi: qla2xxx: Use raw_smp_processor_id() instead of smp_processor_id() 35c02a333d52 scsi: qla2xxx: Select qpair depending on which CPU post_cmd() gets called 3a8ac77a70cc wifi: ath11k: Cleanup mac80211 references on failure during tx_complete 1cccd28aa591 wifi: ath11k: fix tx status reporting in encap offload mode dc1ab6577475 arm64: dts: qcom: sdm845-db845c: Mark cont splash memory region as reserved 03b808058a88 s390/pkey: fix PKEY_TYPE_EP11_AES handling in PKEY_CLR2SECK2 IOCTL a84ac8995ac7 f2fs: get out of a repeat loop when getting a locked data page 8b3b859bf8be f2fs: optimize iteration over sparse directories 3134156e3421 ARM: dts: qcom: msm8974pro-castor: correct touchscreen syna,nosleep-mode 064f57151dff ARM: dts: qcom: msm8974pro-castor: correct touchscreen function names 21e5e3c3f71c ARM: dts: qcom: msm8974pro-castor: correct inverted X of touchscreen 05951f5c26b4 ARM: dts: samsung: exynos4210-i9100: Fix LCD screen's physical size 226590fbd967 ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2 70a1df9e0b44 i2c: xiic: Correct return value check for xiic_reinit() fb9cfb28bdde i2c: mux: gpio: Add missing fwnode_handle_put() 976c8c1c4073 i2c: mux: demux-pinctrl: check the return value of devm_kstrdup() 50a096aab61f gpio: tb10x: Fix an error handling path in tb10x_gpio_probe() 908b3b5e97d2 cifs: Fix UAF in cifs_demultiplex_thread() 7e4f49cd2bd7 proc: nommu: fix empty /proc//maps 1d45e6d9951d proc: nommu: /proc//maps: release mmap read lock c5c9ee388723 igc: Expose tx-usecs coalesce setting to user cae59ae73106 octeontx2-pf: Do xdp_do_flush() after redirects. 98ebbdefe490 bnxt_en: Flush XDP for bnxt_poll_nitroa0()'s NAPI 26f1829c8538 net: ena: Flush XDP packets on error. d64e738adc5c locking/seqlock: Do the lockdep annotation before locking in do_write_seqcount_begin_nested() 987a7f5311ba i915/pmu: Move execlist stats initialization to execlist specific setup ea5a61d58886 netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP c4b0facd5c20 netfilter: nf_tables: disable toggling dormant table state more than once 51fa66024a5e net: rds: Fix possible NULL-pointer dereference 2f0acb0736ec team: fix null-ptr-deref when team device type is changed 89f9f20b1cbd net: bridge: use DEV_STATS_INC() 69d7eef31ee1 net: hns3: add 5ms delay before clear firmware reset irq source b1b85b3d767e net: hns3: fix fail to delete tc flower rules during reset issue d3f7af41de52 net: hns3: only enable unicast promisc when mac table full ed6a0b21b6ac net: hns3: fix GRE checksum offload issue 430f18eed1c1 net: hns3: add cmdq check for vf periodic service task adbcec23c842 x86/srso: Fix SBPB enablement for spec_rstack_overflow=off 755195b2d2df x86/srso: Fix srso_show_state() side effect 7f301aa243b9 platform/x86: intel_scu_ipc: Fail IPC send if still busy b34121a8fec1 platform/x86: intel_scu_ipc: Don't override scu in intel_scu_ipc_dev_simple_command() 962444595841 platform/x86: intel_scu_ipc: Check status upon timeout in ipc_wait_for_interrupt() 98a5a7f344fa platform/x86: intel_scu_ipc: Check status after timeout in busy_loop() 8ef5cc6b4ef0 net: hsr: Properly parse HSRv1 supervisor frames. eef16bfdb212 x86/mm, kexec, ima: Use memblock_free_late() from ima_free_kexec_buffer() 73be49248a04 dccp: fix dccp_v4_err()/dccp_v6_err() again c2019f0a6816 powerpc/perf/hv-24x7: Update domain value check 5734d22c9ea0 scsi: iscsi_tcp: restrict to TCP sockets 2712545e535d ipv4: fix null-deref in ipv4_link_failure 54228157fb57 igc: Fix infinite initialization loop with early XDP redirect 40b5032c9951 ionic: fix 16bit math issue when PAGE_SIZE >= 64KB f2c6e5945da5 netfilter, bpf: Adjust timeouts of non-confirmed CTs in bpf_ct_insert_entry() d98bad2998fd i40e: Fix VF VLAN offloading when port VLAN is configured 0546cd573404 iavf: schedule a request immediately after add/delete vlan 00bbedbd7c5a iavf: add iavf_schedule_aq_request() helper 16fd3c37d1ca ASoC: SOF: core: Only call sof_ops_free() on remove if the probe was successful 211aac2ef6ff iavf: do not process adminq tasks when __IAVF_IN_REMOVE_TASK is set 65976385d49f octeon_ep: fix tx dma unmap len values in SG 66823a9025bc ASoC: imx-audmix: Fix return error with devm_clk_get() ee79256b1615 ASoC: hdaudio.c: Add missing check for devm_kstrdup 488ea2a3e266 net/core: Fix ETH_P_1588 flow dissector bf560c8a83ca selftests: tls: swap the TX and RX sockets in some tests f5a75b3d31d3 netfilter: conntrack: fix extension size table 09424e88126e ALSA: hda/realtek: Splitting the UX3402 into two separate models 1698854b03a5 ASoC: rt5640: Fix IRQ not being free-ed for HDA jack detect mode 293e4920f715 ASoC: rt5640: Revert "Fix sleep in atomic context" e388671635ac bpf: Avoid deadlock when using queue and stack maps from NMI 1e01b127685f netfilter: nf_tables: disallow element removal on anonymous sets 7a7fd891022a ASoC: meson: spdifin: start hw on dai probe 7e5d732e6902 netfilter: nf_tables: fix memleak when more than 255 elements expired be4fbbbcd2f2 netfilter: nft_set_hash: try later when GC hits EAGAIN on iteration 973288e9d988 netfilter: nft_set_pipapo: stop GC iteration if GC transaction allocation fails 8c643a8e040d netfilter: nft_set_pipapo: call nft_trans_gc_queue_sync() in catchall GC 92b4b4bde940 netfilter: nft_set_rbtree: use read spinlock to avoid datapath contention 9a8c544158f6 netfilter: nft_set_rbtree: skip sync GC for new elements in this transaction a42ac74c9666 netfilter: nf_tables: defer gc run if previous batch is still pending 620e594be334 netfilter: nf_tables: use correct lock to protect gc_list 5d319f7a8143 netfilter: nf_tables: GC transaction race with abort path afa584c35065 netfilter: nf_tables: GC transaction race with netns dismantle 41113aa5698a netfilter: nf_tables: fix GC transaction races with netns and netlink event exit path 59ee68c437c5 netfilter: nf_tables: don't fail inserts if duplicate has expired 0b9af4860a61 netfilter: nf_tables: remove busy mark and gc batch API 4ead4f74b3a9 netfilter: nft_set_hash: mark set element as dead when deleting from packet path df650d6a4bf4 netfilter: nf_tables: adapt set backend to use GC transaction API ea3eb9f2192e netfilter: nf_tables: GC transaction API to avoid race with control plane 59dab3bf0b8f netfilter: nf_tables: don't skip expired elements during walk 6bb88a0344c0 ext4: do not let fstrim block system suspend b4d5db1c77fa ext4: move setting of trimmed bit into ext4_try_to_trim_range() 1e3c25df7d40 ext4: replace the traditional ternary conditional operator with with max()/min() 39c4a9522db0 btrfs: remove BUG() after failure to insert delayed dir index item 0d1a761dec22 btrfs: improve error message after failure to add delayed dir index item dbf1a7198505 dm: fix a race condition in retrieve_deps df9950d37df1 netfs: Only call folio_start_fscache() one time for each folio 2d9757480b43 media: via: Use correct dependency for camera sensor drivers ae68541d5285 media: v4l: Use correct dependency for camera sensor drivers a997d583571b NFSv4.1: fix pnfs MDS=DS session trunking f86a2c2ea085 NFSv4.1: use EXCHGID4_FLAG_USE_PNFS_DS for DS server 839e07de9a0a SUNRPC: Mark the cred for revalidation if the server rejects it 13acbca81eee NFS/pNFS: Report EINVAL errors from connect() to the server edd1f0614510 NFS: More fixes for nfs_direct_write_reschedule_io() d4729af1c73c NFS: Use the correct commit info in nfs_join_page_group() 1f49386d6779 NFS: More O_DIRECT accounting fixes for error paths 4d98038e5bd9 NFS: Fix O_DIRECT locking issues f16fd0b11f0f NFS: Fix error handling for O_DIRECT write scheduling Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 5d66067b39e7f9d442d44d8025fe20a0fa7efba7) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 4 ++-- .../recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 4 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 16 ++++++++-------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index a56addd4d5..ab6dbdb52d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -15,12 +15,12 @@ python () { } SRCREV_machine ?= "4b3040c1dc13aaac356ad4ef45a8926118c732d0" -SRCREV_meta ?= "943c6fe5dac329c7e1c30d602788f409e692b3a8" +SRCREV_meta ?= "3b4113ce39d722191d1eb0e159976d653de4d2b2" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.55" +LINUX_VERSION ?= "6.1.56" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index cb94d2d28e..29459fabed 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.55" +LINUX_VERSION ?= "6.1.56" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "644e73fa089ade30c0db7bd54be960be92546ba2" -SRCREV_meta ?= "943c6fe5dac329c7e1c30d602788f409e692b3a8" +SRCREV_meta ?= "3b4113ce39d722191d1eb0e159976d653de4d2b2" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index ef451efea5..21e22c887e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -19,16 +19,16 @@ KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" SRCREV_machine:qemuarm ?= "cf771f6d6bc0344e048bdbf7d23d3aacbe3556d0" SRCREV_machine:qemuarm64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" -SRCREV_machine:qemuloongarch64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" +SRCREV_machine:qemuloongarch64 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" SRCREV_machine:qemumips ?= "4be1dcc270e6ddeea513af01d91ea3b48ec82470" SRCREV_machine:qemuppc ?= "644e73fa089ade30c0db7bd54be960be92546ba2" -SRCREV_machine:qemuriscv64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" -SRCREV_machine:qemuriscv32 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" -SRCREV_machine:qemux86 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" -SRCREV_machine:qemux86-64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" +SRCREV_machine:qemuriscv64 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" +SRCREV_machine:qemuriscv32 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" +SRCREV_machine:qemux86 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" +SRCREV_machine:qemux86-64 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" SRCREV_machine:qemumips64 ?= "aa0e978c979b84d620ad21132cfdbbf857be3878" -SRCREV_machine ?= "644e73fa089ade30c0db7bd54be960be92546ba2" -SRCREV_meta ?= "943c6fe5dac329c7e1c30d602788f409e692b3a8" +SRCREV_machine ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" +SRCREV_meta ?= "3b4113ce39d722191d1eb0e159976d653de4d2b2" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same @@ -43,7 +43,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.55" +LINUX_VERSION ?= "6.1.56" PV = "${LINUX_VERSION}+git${SRCPV}" From patchwork Fri Oct 20 15:51:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32670 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 784A7CDB474 for ; Fri, 20 Oct 2023 15:51:59 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web10.57864.1697817111573738255 for ; Fri, 20 Oct 2023 08:51:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=14twKhIZ; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1c9b7c234a7so7835865ad.3 for ; Fri, 20 Oct 2023 08:51:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817110; x=1698421910; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=GHZ31MIEmLVnZMOySR1x+BBJfhj3kretdKAieM5YumA=; b=14twKhIZoPMMVLfZS8h5zPqDFzqXCS9LQpSGcZNbFAulGRhyEHJXQUtinKXmqA6Ngp PPpNNfYd5ZAbDcD98mZ33vs6bGB36yb+aqCIoGQ2I0wEMiI0iyUTrVQCcLCHITPcizKu b6KCK2E3yHZJeoHODtYZ65Fil5zjhcaID8AW65x9pXlwNEX5bRyz4SQqIH1oex5GIXfo 5B1kzPqu6ws18NvjGyzwBHW0yJcNnZSk09NYKnun9magF0FvxwfLUQ0uaBG685hTan7R 7KO1Acw28YUzoS2oJVlE7qeM7m7N6LQMZW3gKGeopOMwGZAXTmLGbUL+7zv70ZGfuEEv VppA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817111; x=1698421911; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GHZ31MIEmLVnZMOySR1x+BBJfhj3kretdKAieM5YumA=; b=QzKAygPCMRs3QinbTKS+6gM7YJUWapd2le34q1shx2WmoqDrmRkl3P/sH6CwRoZtKD DCoRk6qAEoX5U7k2JXUMRwpE+5Ah8cncADYuNcTuLsLHBiSZ/Frhy4+Py31aUgYdvSS3 sBTk96lpN+LPZ/aOWaKjujUurX+3Tos7mN53ts4CwMKYIVmtt1TtrQTr3DqM8MsQQHeb OxQZYtQT+CBNui7+uafbY8KNRq8a00h/qdkEbpq0XS0dCPduJLlZDf46x0aQMQp/ATe7 7M3ZWIIv4fFqpH3VS7TVP35I0sM94Bk0rQyMKA9XQkEWxUysTnK1xohxTKY4wbOuHvmN owKw== X-Gm-Message-State: AOJu0YwvksZX9KiGFHWz04pp2qqc94GuJfnwKAWQP+dzdNQWKi3LIB/9 BsgDG34a2j0GmXIjR4957qfw6PSxfGFx88322Zg= X-Google-Smtp-Source: AGHT+IGN9K8OPdhw7rdjT9gX5nAnp/C/bGWJvDJP4/Er27Lg/nGczlj5z7gVzO/fmEvfdBnANarbwQ== X-Received: by 2002:a17:902:f550:b0:1ca:7086:60f7 with SMTP id h16-20020a170902f55000b001ca708660f7mr2306823plf.28.1697817110518; Fri, 20 Oct 2023 08:51:50 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:50 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 10/24] linux-yocto/6.1: tiny: fix arm 32 boot Date: Fri, 20 Oct 2023 05:51:12 -1000 Message-Id: <80dd08fb9685ae04e4c9f99d9dd32d9044efe8f2.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189555 From: Bruce Ashfield Integrating the following commit(s) to linux-yocto/.: 0816d0a6984 qemuarma15: add ARM_PATCH_PHYS_VIRT Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 732d1ee4bc824cb52fab4327601efdb1558b6d9c) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb | 2 +- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index ab6dbdb52d..bd782d1b09 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -15,7 +15,7 @@ python () { } SRCREV_machine ?= "4b3040c1dc13aaac356ad4ef45a8926118c732d0" -SRCREV_meta ?= "3b4113ce39d722191d1eb0e159976d653de4d2b2" +SRCREV_meta ?= "0816d0a6984e2abbbc5aef9db16391a97b7c9850" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 29459fabed..11d87d23a7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -18,7 +18,7 @@ KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" SRCREV_machine ?= "644e73fa089ade30c0db7bd54be960be92546ba2" -SRCREV_meta ?= "3b4113ce39d722191d1eb0e159976d653de4d2b2" +SRCREV_meta ?= "0816d0a6984e2abbbc5aef9db16391a97b7c9850" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 21e22c887e..03cecb2da1 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -28,7 +28,7 @@ SRCREV_machine:qemux86 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" SRCREV_machine:qemux86-64 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" SRCREV_machine:qemumips64 ?= "aa0e978c979b84d620ad21132cfdbbf857be3878" SRCREV_machine ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" -SRCREV_meta ?= "3b4113ce39d722191d1eb0e159976d653de4d2b2" +SRCREV_meta ?= "0816d0a6984e2abbbc5aef9db16391a97b7c9850" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same From patchwork Fri Oct 20 15:51:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32674 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 826FFC00A98 for ; Fri, 20 Oct 2023 15:51:59 +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.web11.58036.1697817114410406448 for ; Fri, 20 Oct 2023 08:51:54 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Mo/KEhY8; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1c9fa869a63so7318485ad.0 for ; Fri, 20 Oct 2023 08:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817113; x=1698421913; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VRnXnU9exbVqzSwHTWWMzxTFyyHeli/GG49T+Y3EMVo=; b=Mo/KEhY8NdXxZDordL6Ddflx1RMFJPM30CyNAWjz2FIU9GvNGtIfLn2xdpFH2Rqu/f ejwCN42D6QPJ+LKOX5rsANvjUfg9OrPxKqnY3RFfaHMdQBB9Pc3TwpC4IuWoATwmxX84 8ukbCjeCD3Oqd3KgFnFfmOBEID2qT0KtaR2KAalDeZ2A47gZuM5VyeV13FgMS5F42vjf jtLnTW3KkDPd8psOMw5vnCYKAvfbAEQ42uqBKyfz+oNaMpPTLvHuvV6sMmhAJHJUoWFV DlZW1YzOHe3ZiHrZTERT0sbjnEV/K5FZ9fQfMNg8poa4W4hLkPN2kQ1QjdyVkHod1CYG GveA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817113; x=1698421913; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VRnXnU9exbVqzSwHTWWMzxTFyyHeli/GG49T+Y3EMVo=; b=mFFGxSB6pd3GZJqUvigaeJpAtnE/BUXV+Esr4O79XIA7NY3xYpcZ54O8m6YvQNcy4p BWvjYdwzcjpL2NeT1z7xfBVXWb/dKL7oZYLb0ocMTmdfXEqwd4EVIn52cISGipnYGrlx tvePpiNfMAi2P0SsUDTNQD5zFFmBBGfEzOLFARaxLcYrXhd3ibo7GnTXILKeUjj8jerE XM83i/3xh5QgRrqzaBLUr2OGc3zYJzoZ/GVDBEnmQki1CQBwupehL1C/LZs+6nPBAi2r WNtXEDyioDXkA0W6EwggaTCWPepDLPosB3DCdRjqPAOyBI2DAOu6UPWV24m8sRm95Rsn GiJA== X-Gm-Message-State: AOJu0Yyak+yKi7dTph0AHRcTT4bEu/uVtF7VfEMhdHG+7Xwo6GOjTaVZ N9MjmbKJ9zeUPP/xKPlWcBTjKFRg1Z4BgazKwJI= X-Google-Smtp-Source: AGHT+IHcGKYUggvqA+2k9SIastPaIvEOeL2HKe+RdJpQARBGzyxTd4Q6w8g7bDyUA7rnk5aN98JBtg== X-Received: by 2002:a17:902:f0c4:b0:1c8:a132:a00f with SMTP id v4-20020a170902f0c400b001c8a132a00fmr1987226pla.12.1697817113148; Fri, 20 Oct 2023 08:51:53 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:52 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 11/24] linux-yocto/6.1: update to v6.1.57 Date: Fri, 20 Oct 2023 05:51:13 -1000 Message-Id: <61392049b50c12016f96693549482c758e9f8bd7.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189556 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 082280fe94a0 Linux 6.1.57 a4cc925e2e12 xen/events: replace evtchn_rwlock with RCU a4fcf8a242c6 ipv6: remove one read_lock()/read_unlock() pair in rt6_check_neigh() 6e4c40aa270b btrfs: file_remove_privs needs an exclusive lock in direct io write ff81d1c77d08 netlink: remove the flex array from struct nlmsghdr 6cd57f5c7795 btrfs: fix fscrypt name leak after failure to join log transaction 6d05a1a7a484 btrfs: fix an error handling path in btrfs_rename() 5aaa45025f9f vrf: Fix lockdep splat in output path fd32f1eee6c0 ipv6: remove nexthop_fib6_nh_bh() edeccce85cbe parisc: Restore __ldcw_align for PA-RISC 2.0 processors 8226ffc759ea ksmbd: fix uaf in smb20_oplock_break_ack a2ca5fd3dbcc ksmbd: fix race condition between session lookup and expire 64301a935462 x86/sev: Use the GHCB protocol when available for SNP CPUID requests 76b6a980e85f RDMA/mlx5: Fix NULL string error 26eb1307c704 RDMA/mlx5: Fix mutex unlocking on error flow for steering anchor creation 5cf38e638e5d RDMA/siw: Fix connection failure handling 2b298f918158 RDMA/srp: Do not call scsi_done() from srp_abort() c54204d7960f RDMA/uverbs: Fix typo of sizeof argument 233229fa577a RDMA/cma: Fix truncation compilation warning in make_cma_ports 39f701870114 RDMA/cma: Initialize ib_sa_multicast structure to 0 when join 52b0bb7139c9 gpio: pxa: disable pinctrl calls for MMP_GPIO d09e467491b2 gpio: aspeed: fix the GPIO number passed to pinctrl_gpio_set_config() 7e47a8419da6 IB/mlx4: Fix the size of a buffer in add_port_entries() 315ae630502c of: dynamic: Fix potential memory leak in of_changeset_action() 9c480fb41aa4 RDMA/core: Require admin capabilities to set system parameters f60287b2d240 dm zoned: free dmz->ddev array in dmz_put_zoned_devices 485f0bac83a6 parisc: Fix crash with nr_cpus=1 option c9c110ce3754 smb: use kernel_connect() and kernel_bind() ec02b892237d intel_idle: add Emerald Rapids Xeon support cdcc04e844a2 HID: intel-ish-hid: ipc: Disable and reenable ACPI GPE bit 07c6338acb15 HID: sony: remove duplicate NULL check before calling usb_free_urb() 40d609b6ad90 netlink: annotate data-races around sk->sk_err 0915de8c6083 netlink: Fix potential skb memleak in netlink_ack 1a6e2da05f37 netlink: split up copies in the ack construction 220f0f866d69 sctp: update hb timer immediately after users change hb_interval 63cb52e75fd1 sctp: update transport state when processing a dupcook packet 419b2c5766fa tcp: fix delayed ACKs for MSS boundary condition 4acf07bafb58 tcp: fix quick-ack counting to count actual ACKs of new data 143e72757a90 tipc: fix a potential deadlock on &tx->lock f2697457ab73 net: stmmac: dwmac-stm32: fix resume on STM32 MCU da7fa17bd9ac ipv4: Set offload_failed flag in fibmatch results 56a6ea76dd9b netfilter: nf_tables: nft_set_rbtree: fix spurious insertion failure 7ff9a9857b8b netfilter: nf_tables: Deduplicate nft_register_obj audit logs e1bbe4afe1a3 selftests: netfilter: Extend nft_audit.sh 82273f15e3db selftests: netfilter: Test nf_tables audit logging 00d35e6b1672 netfilter: handle the connecting collision properly in nf_conntrack_proto_sctp 6e1dbbf29031 ibmveth: Remove condition to recompute TCP header checksum. 2428c557cd62 net: ethernet: ti: am65-cpsw: Fix error code in am65_cpsw_nuss_init_tx_chns() 7562780e32b8 net: nfc: llcp: Add lock when modifying device list 9ffc5018020f net: usb: smsc75xx: Fix uninit-value access in __smsc75xx_read_reg 7f042041360e ipv6: tcp: add a missing nf_reset_ct() in 3WHS handling a003d4994088 net: dsa: mv88e6xxx: Avoid EEPROM timeout when EEPROM is absent 6a91ec7cfd0e ptp: ocp: Fix error handling in ptp_ocp_device_init f6a7182179c0 ipv4, ipv6: Fix handling of transhdrlen in __ip{,6}_append_data() a8ed1b2e1674 neighbour: fix data-races around n->output 2b76aad68b30 neighbour: switch to standard rcu, instead of rcu_bh 0526933c1005 neighbour: annotate lockless accesses to n->nud_state 8904d8848b31 bpf: Add BPF_FIB_LOOKUP_SKIP_NEIGH for bpf_fib_lookup f82aac816287 net: fix possible store tearing in neigh_periodic_work() 8ef7f9acbe8e modpost: add missing else to the "of" check b8f97e47b6fb bpf, sockmap: Reject sk_msg egress redirects to non-TCP sockets c024db960301 bpf, sockmap: Do not inc copied_seq when PEEK flag set 46052a98854a bpf: tcp_read_skb needs to pop skb regardless of seq 99fe9a120729 NFSv4: Fix a nfs4_state_manager() race 23acd1784eb5 ima: rework CONFIG_IMA dependency block 6c5d7f541693 scsi: target: core: Fix deadlock due to recursive locking f23c35f0686c ima: Finish deprecation of IMA_TRUSTED_KEYRING Kconfig 937ec4434e0a regulator/core: regulator_register: set device->class earlier fbac416e25ef iommu/mediatek: Fix share pgtable for iova over 4GB 183e0f9da6af perf/x86/amd: Do not WARN() on every IRQ 2f4e16e39e4f wifi: mac80211: fix potential key use-after-free 89192c6cbe0f regmap: rbtree: Fix wrong register marked as in-cache when creating new node e485a69d9b44 perf/x86/amd/core: Fix overflow reset on hotplug 6150d4596861 wifi: mt76: mt76x02: fix MT76x0 external LNA gain handling b9eded289bea drivers/net: process the result of hdlc_open() and add call of hdlc_close() in uhdlc_close() 6bfc4c7043c8 Bluetooth: ISO: Fix handling of listen for unicast c201d944bc38 Bluetooth: Delete unused hci_req_prepare_suspend() declaration b46384a681a8 regulator: mt6358: split ops for buck and linear range LDO regulators a01576f58b19 regulator: mt6358: Use linear voltage helpers for single range regulators c6ac402567e4 regulator: mt6358: Drop *_SSHUB regulators 163042a01544 bpf: Fix tr dereferencing c14c7214fc68 leds: Drop BUG_ON check for LED_COLOR_ID_MULTI 6b706286473d wifi: mwifiex: Fix oob check condition in mwifiex_process_rx_packet 42970d32fe1e wifi: cfg80211: add missing kernel-doc for cqm_rssi_work c797498e860e wifi: cfg80211: fix cqm_config access race 3fcc6d7d5f40 wifi: cfg80211: add a work abstraction with special semantics 2ae4585f740a wifi: cfg80211: move wowlan disable under locks fb195ff4183a wifi: cfg80211: hold wiphy lock in auto-disconnect 6b3223449c95 wifi: iwlwifi: mvm: Fix a memory corruption issue 78b5c62edeea wifi: iwlwifi: dbg_ini: fix structure packing 6a5a8f0a9740 erofs: fix memory leak of LZMA global compressed deduplication 91aeb418b917 ubi: Refuse attaching if mtd's erasesize is 0 f237b17611fa HID: sony: Fix a potential memory leak in sony_probe() 6e3ae2927b43 arm64: errata: Add Cortex-A520 speculative unprivileged load workaround 0a4ae2634801 arm64: Add Cortex-A520 CPU part definition d2894c4f473a drm/amd: Fix logic error in sienna_cichlid_update_pcie_parameters() c8bd3e12b329 drm/amd: Fix detection of _PR3 on the PCIe root port fc8d9630c80b net: prevent rewrite of msg_name in sock_sendmsg() 34f9370ae444 net: replace calls to sock->ops->connect() with kernel_connect() 2dfb5f324d79 PCI: qcom: Fix IPQ8074 enumeration ebf2d9a7822b md/raid5: release batch_last before waiting for another stripe_head c404d39e7749 wifi: mwifiex: Fix tlv_buf_left calculation 794ae3a9f8fe Bluetooth: hci_sync: Fix handling of HCI_QUIRK_STRICT_DUPLICATE_FILTER 626535077ba9 Bluetooth: hci_codec: Fix leaking content of local_codecs 01afbfb39585 qed/red_ll2: Fix undefined behavior bug in struct qed_ll2_info 454bb54b8fe8 mptcp: userspace pm allow creating id 0 subflow 4674e9626beb net: ethernet: mediatek: disable irq before schedule napi 3a72decd6b49 vringh: don't use vringh_kiov_advance() in vringh_iov_xfer() c12ef025add7 iommu/vt-d: Avoid memory allocation in iommu_suspend() cdf18e75850f scsi: zfcp: Fix a double put in zfcp_port_enqueue() ef167cc1882f i40e: fix the wrong PTP frequency calculation a0829d9cf22e hwmon: (nzxt-smart2) add another USB ID 6ddb9e6b9b6a hwmon: (nzxt-smart2) Add device id 752ec2d93e75 block: fix use-after-free of q->q_usage_counter 77d0e7e8e582 rbd: take header_rwsem in rbd_dev_refresh() only when updating 698039a461a3 rbd: decouple parent info read-in from updating rbd_dev 377d26174e1d rbd: decouple header read-in from updating rbd_dev->header 33ecf5f5a876 rbd: move rbd_dev_refresh() definition ff09fa5f23aa iommu/arm-smmu-v3: Avoid constructing invalid range commands 357ba59b9d3b iommu/arm-smmu-v3: Set TTL invalidation hint better 71472872932b drm/amd/display: Adjust the MST resume flow b0fe37867455 arm64: cpufeature: Fix CLRBHB and BC detection b6912642746d net: release reference to inet6_dev pointer bad004c384b7 net: change accept_ra_min_rtr_lft to affect all RA lifetimes ec4162bb7018 net: add sysctl accept_ra_min_rtr_lft 9d91134c165f arm64: Avoid repeated AA64MMFR1_EL1 register read on pagefault path dd8c8369305d Revert "NFSv4: Retry LOCK on OLD_STATEID during delegation return" ef54db5b5df7 btrfs: use struct fscrypt_str instead of struct qstr 68ad364ec8dd btrfs: setup qstr from dentrys using fscrypt helper 1cf474cd474b btrfs: use struct qstr instead of name and namelen pairs 87efd87d3624 ring-buffer: Fix bytes info in per_cpu buffer stats 62eed43e0390 ring-buffer: remove obsolete comment for free_buffer_page() 836adaddc60c mm: page_alloc: fix CMA and HIGHATOMIC landing on the wrong buddy list d1da921452b3 mm/page_alloc: leave IRQs enabled for per-cpu page allocations 570786ac6f04 mm/page_alloc: always remove pages from temporary list 939189aedfac mm: mempolicy: keep VMA walk if both MPOL_MF_STRICT and MPOL_MF_MOVE are specified ce9f3441fc6a mm/mempolicy: convert migrate_page_add() to migrate_folio_add() dc0a8466cd11 mm/mempolicy: convert queue_pages_pte_range() to queue_folios_pte_range() 6c2c728d299f mm/mempolicy: convert queue_pages_pmd() to queue_folios_pmd() 6d6635749d4c mm/memory: add vm_normal_folio() 89f2ace6d016 NFSv4: Fix a state manager thread deadlock regression 80ba4fd1ac33 NFS: rename nfs_client_kset to nfs_kset 15ff58702361 NFS: Cleanup unused rpc_clnt variable 2f09a09d73cb ata: libata-scsi: Fix delayed scsi_rescan_device() execution f2b359e3a4f3 scsi: Do not attempt to rescan suspended devices 5d3b0fcb3ca6 scsi: core: Improve type safety of scsi_rescan_device() deacabef6834 scsi: sd: Do not issue commands to suspended disks on shutdown 8de6d8449ae9 scsi: sd: Differentiate system and runtime start/stop management dc3354c961ba ata,scsi: do not issue START STOP UNIT on resume 078651647064 mptcp: process pending subflow error on close fc8917b79069 mptcp: move __mptcp_error_report in protocol.c c1432ece79e6 mptcp: annotate lockless accesses to sk->sk_err 09b6fdf7a12e mptcp: fix dangling connection hang-up 7544918e48e6 mptcp: rename timer related helper to less confusing names bbdfef76096d ASoC: tegra: Fix redundant PLLA and PLLA_OUT0 updates 5f9d73761553 ASoC: soc-utils: Export snd_soc_dai_is_dummy() symbol 1031f68108ea spi: zynqmp-gqspi: fix clock imbalance on probe failure Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 5e4241c9d5fee655f08e5e5ed82aa7bf24e2701a) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_6.1.bb | 6 ++-- .../linux/linux-yocto-tiny_6.1.bb | 6 ++-- meta/recipes-kernel/linux/linux-yocto_6.1.bb | 28 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb index bd782d1b09..edb7995c7d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.1.bb @@ -14,13 +14,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "4b3040c1dc13aaac356ad4ef45a8926118c732d0" -SRCREV_meta ?= "0816d0a6984e2abbbc5aef9db16391a97b7c9850" +SRCREV_machine ?= "a3ae026c0673c043e1fd3374e488a78b29249534" +SRCREV_meta ?= "8aa5efbc5e5361efc8b11c5aec9b967085613a0b" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" -LINUX_VERSION ?= "6.1.56" +LINUX_VERSION ?= "6.1.57" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb index 11d87d23a7..67c2781fd4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.1.bb @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc # CVE exclusions include recipes-kernel/linux/cve-exclusion_6.1.inc -LINUX_VERSION ?= "6.1.56" +LINUX_VERSION ?= "6.1.57" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "644e73fa089ade30c0db7bd54be960be92546ba2" -SRCREV_meta ?= "0816d0a6984e2abbbc5aef9db16391a97b7c9850" +SRCREV_machine ?= "8a449d3428e673be0bdb504dadb666b4ad7208e3" +SRCREV_meta ?= "8aa5efbc5e5361efc8b11c5aec9b967085613a0b" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_6.1.bb b/meta/recipes-kernel/linux/linux-yocto_6.1.bb index 03cecb2da1..ef4de9ffcf 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.1.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.1.bb @@ -17,25 +17,25 @@ KBRANCH:qemux86-64 ?= "v6.1/standard/base" KBRANCH:qemuloongarch64 ?= "v6.1/standard/base" KBRANCH:qemumips64 ?= "v6.1/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "cf771f6d6bc0344e048bdbf7d23d3aacbe3556d0" -SRCREV_machine:qemuarm64 ?= "644e73fa089ade30c0db7bd54be960be92546ba2" -SRCREV_machine:qemuloongarch64 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" -SRCREV_machine:qemumips ?= "4be1dcc270e6ddeea513af01d91ea3b48ec82470" -SRCREV_machine:qemuppc ?= "644e73fa089ade30c0db7bd54be960be92546ba2" -SRCREV_machine:qemuriscv64 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" -SRCREV_machine:qemuriscv32 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" -SRCREV_machine:qemux86 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" -SRCREV_machine:qemux86-64 ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" -SRCREV_machine:qemumips64 ?= "aa0e978c979b84d620ad21132cfdbbf857be3878" -SRCREV_machine ?= "f21f9d92e463bcfa7e64887f14676225144ed8d1" -SRCREV_meta ?= "0816d0a6984e2abbbc5aef9db16391a97b7c9850" +SRCREV_machine:qemuarm ?= "0ef61a389975a4019142c5f1e6608e6cc0a0df29" +SRCREV_machine:qemuarm64 ?= "8a449d3428e673be0bdb504dadb666b4ad7208e3" +SRCREV_machine:qemuloongarch64 ?= "8a449d3428e673be0bdb504dadb666b4ad7208e3" +SRCREV_machine:qemumips ?= "d15ee28355bed16d59dd7d56259d2132e5c1c4ad" +SRCREV_machine:qemuppc ?= "8a449d3428e673be0bdb504dadb666b4ad7208e3" +SRCREV_machine:qemuriscv64 ?= "8a449d3428e673be0bdb504dadb666b4ad7208e3" +SRCREV_machine:qemuriscv32 ?= "8a449d3428e673be0bdb504dadb666b4ad7208e3" +SRCREV_machine:qemux86 ?= "8a449d3428e673be0bdb504dadb666b4ad7208e3" +SRCREV_machine:qemux86-64 ?= "8a449d3428e673be0bdb504dadb666b4ad7208e3" +SRCREV_machine:qemumips64 ?= "e740b68e38e55ca342ab3b70fa2f965c5a86758b" +SRCREV_machine ?= "8a449d3428e673be0bdb504dadb666b4ad7208e3" +SRCREV_meta ?= "8aa5efbc5e5361efc8b11c5aec9b967085613a0b" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "d23900f974e0fb995b36ef47283a5aa74ca25f51" +SRCREV_machine:class-devupstream ?= "082280fe94a09462c727fb6e7b0c982efb36dede" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v6.1/base" @@ -43,7 +43,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=${KMETA};protocol=https" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "6.1.56" +LINUX_VERSION ?= "6.1.57" PV = "${LINUX_VERSION}+git${SRCPV}" From patchwork Fri Oct 20 15:51:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32672 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 91500C0032E for ; Fri, 20 Oct 2023 15:51:59 +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.web11.58037.1697817116015317379 for ; Fri, 20 Oct 2023 08:51:56 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=wmcIZFdk; spf=softfail (domain: sakoman.com, ip: 209.85.214.172, mailfrom: steve@sakoman.com) Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-1cacde97002so3806985ad.2 for ; Fri, 20 Oct 2023 08:51:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817115; x=1698421915; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=jClcPtENd1hj/vOnPWZFW7UjaQn3eO+zP0CZnaBaK4M=; b=wmcIZFdkUe25B3KPBK5dA5k/0w/dM2OLFBHHTwy4G5Dh80PI4UDXJnkuiL8Ik3tEBo tANtT8s/FQcwVqA0rerqIYIu5T4pSxAsSsam32TW7gN4rER3gXM7f0FGVIg2i///7aE7 AjQMENk9U3E8lcf3YgFfRm3DsOAxdG1i8utJHAwdIIAtM/ivtZb4Y2azf5FI0448U7XV mgEUSvnMX3bFZrvAzdXKFaNpRPh+hgM5ELWZeerYvq8yo9vmIonxyOHpInqoPJF4fDno IzE2mPzZFA7ibb5N23TckvSm17axKhTMyF6Emj+L79+VBXicAvwfkxm5oKk24Jbf72Vs al0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817115; x=1698421915; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jClcPtENd1hj/vOnPWZFW7UjaQn3eO+zP0CZnaBaK4M=; b=RkHhmWyhnf5qm0vL6lVErXb/A0rnrV2px4vkW2HhJf7G0RZt4ODIS0uxYckR38WDuO ey/EZVKi4IJu7FIosRhZZZXI8227jnzsWYI5I3sThAwKcmfPmZLSr3ZhBhxbQMZiXdBQ romKhrl6FKR8Ucpk9uyj/LHHb6JI+eJ3y3UZSnzzWIfyASdTQGLNicskHh2VMegmzHZM sOmo7Ps4LAkMaJ9+rlrvoFliYCBybv7sGKh/NLz4WspbhNIjKItv3XYKpIjewleNPjtj 8+/x9r3Mq1rU4P/X3ne1bhGHfNhuDIlkOhBtFBOdtzoyKj3ZguHPChSqw89JCWUkvYXn 4FCA== X-Gm-Message-State: AOJu0Yy417dFMoKc75+tyBH4XXJkJjuDwrQq89x5SjF2YUgpYQ52aODg YB/0fDAt7CBBERyyS+NtpEEWJrifHIX+4iP8eZs= X-Google-Smtp-Source: AGHT+IHlAO3Y0SI6dABfvOK5fBP2Ba36+2H2YdZ7jtoWwDROoBPDUWALhfSwKWYwbXkBNTqTgyjfmA== X-Received: by 2002:a17:903:245:b0:1c6:d34:5279 with SMTP id j5-20020a170903024500b001c60d345279mr2249082plh.13.1697817115193; Fri, 20 Oct 2023 08:51:55 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.54 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:54 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 12/24] cve-exclusion_6.1.inc: update for 6.1.57 Date: Fri, 20 Oct 2023 05:51:14 -1000 Message-Id: X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189557 Signed-off-by: Steve Sakoman --- meta/recipes-kernel/linux/cve-exclusion_6.1.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc index b6b9ca00d4..d172261886 100644 --- a/meta/recipes-kernel/linux/cve-exclusion_6.1.inc +++ b/meta/recipes-kernel/linux/cve-exclusion_6.1.inc @@ -1,9 +1,9 @@ # Auto-generated CVE metadata, DO NOT EDIT BY HAND. -# Generated at 2023-09-30 07:26:16.988526+00:00 for version 6.1.55 +# Generated at 2023-10-18 21:33:08.698393+00:00 for version 6.1.57 python check_kernel_cve_status_version() { - this_version = "6.1.55" + this_version = "6.1.57" kernel_version = d.getVar("LINUX_VERSION") if kernel_version != this_version: bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) From patchwork Fri Oct 20 15:51:15 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32673 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 93D64C19F5C for ; Fri, 20 Oct 2023 15:51:59 +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.web10.57868.1697817117725396726 for ; Fri, 20 Oct 2023 08:51:57 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=Lj4sgcM0; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1c9e06f058bso16055975ad.0 for ; Fri, 20 Oct 2023 08:51:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817117; x=1698421917; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=KYAws4fh5tg8x3EywH73UZu88qGOyeqqo3aIDJZkmQk=; b=Lj4sgcM0sPg/CDdo+iaQuHA2cx76pmPVY+BCHJiTqFD9JPChDaXO+hQ0JYRxcloElR KI7qlh4cyNWiEIQz/iOogVEkutpGV2NQ9ewysscE0xtMclKS3PiQydfiAsv2sXyhGfhy zoPFz9w7J8mX6EuAY5lnXT8bs0vkjWn05PbQ+DzTSiJQ56szUTwG/bUjpe7gh8CMH7Qr O8Jq5NMG4E00laVz7sQcBebBwIRzGkzdpgwehN3inGD5xAjKQXOpfQTnHTXqI801VMm8 X3PA9E3HSld09ZnSBPleFBOGlW6JIsO0c/Ij6qzw4lDvtICBE6vUUzIR1HV/nMX0duqY UP0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817117; x=1698421917; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KYAws4fh5tg8x3EywH73UZu88qGOyeqqo3aIDJZkmQk=; b=P9Tn0SvFzxs8051UaPkF7NwUJrt2Zjthm1zF18S0TDCYZx4ql/gGTwbsCffEopkrMp RjRHx3gKD4EqwO+pD3vIASYHLaVdk/V4wczvobvSooXSApvcKNZNdCjo1kgWc0a5Gwkj y/TJyb7eyaxxcSpULcqBVswUeV74++QWoZ6z6oE8Qgg0f5RNFdTpvN201CcEL0OPmXPx Ti3pkOjERVO/3KfnN+dmITcL5uBLCU5qzSzoEJCV8y+VAg4dEZop5QhXw7os9vRBZSk1 qhdW8ppAO4wDE1dRXTobuPs1FQ6Yrf+ObjPLdhyuUFhVp07h7ZKwq2IYQ2UGgSb0Tlam D2bg== X-Gm-Message-State: AOJu0Yxn2JlITXfI26Dd4FU2aF2bsy+qj0Oi44fhLQYme8afaj6GJzzH G5QVx6lf2aJeDdNb6AM85nl2afrInU6q0Op36QM= X-Google-Smtp-Source: AGHT+IG5MUB3ap0IxB0MPAXqjM9qBux++T8Ik1huaiwUclWv/DtKLy1OuZdShFWopwtfYN/2FPQaxg== X-Received: by 2002:a17:903:1c3:b0:1c7:22ae:4080 with SMTP id e3-20020a17090301c300b001c722ae4080mr2975619plh.0.1697817116873; Fri, 20 Oct 2023 08:51:56 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:56 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 13/24] vim: Upgrade 9.0.2009 -> 9.0.2048 Date: Fri, 20 Oct 2023 05:51:15 -1000 Message-Id: X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:51:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189558 From: Siddharth Doshi This includes CVE fix for CVE-2023-5535. Signed-off-by: Siddharth Doshi Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 5e06866692..58025828f2 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -19,8 +19,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://no-path-adjust.patch \ " -PV .= ".2009" -SRCREV = "54844857fd6933fa4f6678e47610c4b9c9f7a091" +PV .= ".2048" +SRCREV = "982ef16059bd163a77271107020defde0740bbd6" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" From patchwork Fri Oct 20 15:51:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32676 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 92A31C001DF for ; Fri, 20 Oct 2023 15:52:09 +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.web11.58039.1697817119710700923 for ; Fri, 20 Oct 2023 08:51:59 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=V/cOeiuX; spf=softfail (domain: sakoman.com, ip: 209.85.214.177, mailfrom: steve@sakoman.com) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-1c0ecb9a075so7519925ad.2 for ; Fri, 20 Oct 2023 08:51:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817119; x=1698421919; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MeG4l1t04l0jDCWXdsSr2pLKylDQYLkk8bOSZw7pnbw=; b=V/cOeiuXNpSBkwZCqIBpF3Jo0h+iLB6aL7/7Xv0CiAQAGdmyAgI9e6Ysh4urM1cxPh frpk+pC/osGrMijbEkgXoi7FTEiWJ/0KdfqF6TeKG2UXjcrE9BVcJ11Pa/1VU41Gy3sT 4Pzv6GA+h1Z9ysPnnHxz0RwScOqhPXJlYAAsla1fvKS22Gfwm+mZVRO3HUcJt9GXeGA+ pa+IEEx7bJKbsHhyuPhEB1Y3skHpY2Wi79IXmZjysEi4HlYofxiQC1ta5J5xj1Is/sBE /TRwnmnnrN2T98HQOIGgU7GcCEf9FE1skgQBoaXSq6dZewgvQ4PIVxCGL9BPO2gutVEs VPtw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817119; x=1698421919; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MeG4l1t04l0jDCWXdsSr2pLKylDQYLkk8bOSZw7pnbw=; b=OicOQafHTVKuh7x66DfxutisufLzoJBXAi0+/kW0RTgGKC+Z1fKQ0eYviZ1qGqeiWf EfhszSKuZzFGGCXWuZwBs0B1edzc9bfG/HmpWWnc4UuJPiV/BcsFcsEh0p0aJo+PmhZ+ 7uP9p40PvsNbS4witlvsUHc6BvnHuo+sVGM/gajeNo86YSt1FT0ja0dys0AVTUbKMwRq KhulOGTgi3ZhtJ6xzZjerReEqTmbJ29hrWHhj2BTJrxPAH3x4xXOpMX7uiEWkr+1Q+UH Ii6AE1IXHGQjjmtZtT5Qkja2Kq1na5KQ1dpL/PIACkrofaK478U8Kld7BFypc1695/GM 1oQw== X-Gm-Message-State: AOJu0YxTvBM/qRrTiYUOsIq97vkVzyqLV3YYKcrYJVCRP2mKAeYaVU5a 5hhB6Z1BRoNXTuKUL4FWkaKwJhCMx4PVJeMsFCA= X-Google-Smtp-Source: AGHT+IFTtxsfN4QDiUpS/QWX3z+AZfIpSxvOXBp9t8NTOWLg5eDJhshyNoH5kic7ExsIEpWgCGDnfQ== X-Received: by 2002:a17:903:41c3:b0:1ca:8468:f05e with SMTP id u3-20020a17090341c300b001ca8468f05emr2430179ple.29.1697817118826; Fri, 20 Oct 2023 08:51:58 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:51:58 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 14/24] uboot-extlinux-config.bbclass: fix missed override syntax migration Date: Fri, 20 Oct 2023 05:51:16 -1000 Message-Id: <585544b99c62d3e4edebd7c4e9225f70069a5176.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:52:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189559 From: Quentin Schulz uboot-extlinux-config allows to specify multiple "labels" (entries in a menu, à-la grub) and each of them have their own values for some fields. Each "base" variable, e.g. UBOOT_EXTLINUX_FDT can be overridden for each label. This is done via the OVERRIDES mechanism based on the label name, e.g. UBOOT_EXTLINUX_FDT:linux if linux is a label. However, OVERRIDES doesn't contain the label globally because it's only necessary in one task. Therefore, the OVERRIDES itself is modified within the task. This means that the sigdata will not be told the dependency on UBOOT_EXTLINUX_FDT:linux, because it cannot know about it. For this reason, we need to explicitly specify which variables this task depends on via vardeps varflag for the task. This was done in the past, but we missed updating it during the override syntax migration so the cache wouldn't get invalidated if someone modifies UBOOT_EXTLINUX_FDT:linux from a configuration file or a bbappend for example. Let's fix this by migrating it to the new syntax. Signed-off-by: Quentin Schulz Signed-off-by: Richard Purdie (cherry picked from commit b4dd9d873508128adbbf5ff6cf0a3df3d2ffbcf6) Signed-off-by: Steve Sakoman --- meta/classes-recipe/uboot-extlinux-config.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/uboot-extlinux-config.bbclass b/meta/classes-recipe/uboot-extlinux-config.bbclass index 653e583663..2f5c665f97 100644 --- a/meta/classes-recipe/uboot-extlinux-config.bbclass +++ b/meta/classes-recipe/uboot-extlinux-config.bbclass @@ -152,7 +152,7 @@ python do_create_extlinux_config() { bb.fatal('Unable to open %s' % (cfile)) } UBOOT_EXTLINUX_VARS = "CONSOLE MENU_DESCRIPTION ROOT KERNEL_IMAGE FDTDIR FDT KERNEL_ARGS INITRD" -do_create_extlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX_%s_%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_LABELS').split()])}" +do_create_extlinux_config[vardeps] += "${@' '.join(['UBOOT_EXTLINUX_%s:%s' % (v, l) for v in d.getVar('UBOOT_EXTLINUX_VARS').split() for l in d.getVar('UBOOT_EXTLINUX_LABELS').split()])}" do_create_extlinux_config[vardepsexclude] += "OVERRIDES" addtask create_extlinux_config before do_install do_deploy after do_compile From patchwork Fri Oct 20 15:51:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32679 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 929EFCDB474 for ; Fri, 20 Oct 2023 15:52:09 +0000 (UTC) Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) by mx.groups.io with SMTP id smtpd.web10.57869.1697817121561073190 for ; Fri, 20 Oct 2023 08:52:01 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=21oTZEID; spf=softfail (domain: sakoman.com, ip: 209.85.214.175, mailfrom: steve@sakoman.com) Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1c9b95943beso7864465ad.1 for ; Fri, 20 Oct 2023 08:52:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817121; x=1698421921; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Dnx36pQGPFUED2DLsYv3GQ0iQ1lwf7MaqmXWCAFvf8M=; b=21oTZEID5HQZv42nBlRgi2cvX2eNTWGzow/+3ngXuvXEk+Mnx6ZKy+88wzpW4QyQWw 7q7yQ8l9GJNScsODgu7TRJkA/ZPpWeCsyJZaPZ4pvzOnS9ri//LOJw6kv8sSjg9ghqtk Q1hyCAQno+gQS7wpS5GZG1n5+h3IoI4Z3aFrjg/DlySA+BM6gq9yBYmJE8WzjqOWFDTm bGd7kS+8GArd2MOmjlIZ51Suoz9BHDBeeEdZC93AvIbNJaXbjfsQl5uXg33md/A/fiph n7L+svXOfEL0gbwhAsOLbxEGkoBCWgCQYthP6a67mMIuqe5DGU49Ng5ghN/x/6+Oh9FI i/4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817121; x=1698421921; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Dnx36pQGPFUED2DLsYv3GQ0iQ1lwf7MaqmXWCAFvf8M=; b=TJBhj0OGk9iMfPmzXxqanPi3QJKdBIKqT9fWsx61ftG0u2/nwP1X5VMUagDf+FXlM/ ca+xOkxrS2b4bcy/sx4j8Gzz5lIflwDoPfBLtuN1u5iwzazTMEioWD5Cdn+IE5Gys1aN d7y9cYttWUT444UWT9xJ9rD79R6xeEpFyzuxVJB6tqB1VMSuLk6cgrqRTrnEt8/JjPFL 4uoFLZVSXUwvuX8gUjhij5ISA4igawZRUR8mPnV//GbzxRygkj9I9AF3C7wk3HQRR0Y4 ukxOgJRH+QYIMgCGiA87wHAZw3sRan6PcOn/5gZ3PtC4ctvPMp1So80FJ39Z0tGpgixz lI/A== X-Gm-Message-State: AOJu0YyzJfpMnwkmc2o0y7y1u+hrqAAXTmFIPkbEBgDBGoGwWa0N+Qu7 AFm0Eb2ugD43B2tp2fLArGUAVQ2yg08R5vE6ZDU= X-Google-Smtp-Source: AGHT+IG0Zn/uDWslAC8nVYhf+jM7uEbR1HXBqjCspA55MIco7N2EwopSt5GIX//T6dXQV1uX99zjkA== X-Received: by 2002:a17:902:c409:b0:1c5:a49e:7aa with SMTP id k9-20020a170902c40900b001c5a49e07aamr2583712plk.27.1697817120656; Fri, 20 Oct 2023 08:52:00 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.51.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:52:00 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 15/24] shadow: fix patch Upstream-Status Date: Fri, 20 Oct 2023 05:51:17 -1000 Message-Id: <2d789678cf430683fc24995514414ddfe32c22b5.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:52:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189560 From: Michael Opdenacker Replace "Accepted" by "Backport" as specified on https://docs.yoctoproject.org/migration-guides/migration-3.2.html#miscellaneous-changes Signed-off-by: Michael Opdenacker Signed-off-by: Richard Purdie (cherry picked from commit 945f1106de1fc1b08921e05aa0f871092c2c116d) Signed-off-by: Steve Sakoman --- .../shadow/files/0001-Fix-can-not-print-full-login.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch b/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch index 37ba5f3dc2..89f9c05c8d 100644 --- a/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch +++ b/meta/recipes-extended/shadow/files/0001-Fix-can-not-print-full-login.patch @@ -7,7 +7,7 @@ Date: Tue Dec 27 17:40:17 2022 +0530 Login timed out message prints only first few bytes when write is immediately followed by exit. Calling exit from new handler provides enough time to display full message. -Upstream-Status: Accepted [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c] +Upstream-Status: Backport [https://github.com/shadow-maint/shadow/commit/670cae834827a8f794e6f7464fa57790d911b63c] diff --git a/src/login.c b/src/login.c index 116e2cb3..c55f4de0 100644 From patchwork Fri Oct 20 15:51:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32675 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 97F87C00A98 for ; Fri, 20 Oct 2023 15:52:09 +0000 (UTC) Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) by mx.groups.io with SMTP id smtpd.web10.57872.1697817123180517256 for ; Fri, 20 Oct 2023 08:52:03 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=NvEpC7WO; spf=softfail (domain: sakoman.com, ip: 209.85.214.179, mailfrom: steve@sakoman.com) Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-1cac80292aeso6399295ad.1 for ; Fri, 20 Oct 2023 08:52:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817122; x=1698421922; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=/WGPZl6Wo6VEw+/a/4YEtvZKMyEoNlFXA9Bo3DERcEE=; b=NvEpC7WOeqPy0x87uLdHn2R3tMFoslbiqocFUqcUKEXjzIj88jdlOwTQ0m6DeyDZCW HsGxzj7kpxyD1YeGFfTjxMtw/nhXp2fiLPNKqHq0dET8eNaWFPfS/z264rthb413S4ux 7S4LQmLywL5PnjmgZzQtSLKA7oXHKD3R04COzeXSevjo6E9kJpDElsASA4Iu6TCPFYol Cn6NrbmgQyDfB9FH7tRGNQSyy8UdBgXDcMa1HRUqf9BPE5nCrKNWb2t9f6ci47CGhyv/ 5VGQ79wHbC+cgqvk1hbqprWrDCkm5sFozxIf1W5ycDm9sqxGZPaVUAViz2femiSduOOH XgJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817122; x=1698421922; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/WGPZl6Wo6VEw+/a/4YEtvZKMyEoNlFXA9Bo3DERcEE=; b=q9oB0tTUKBh3/qoUdr3GKqIEG34LbMQwLfvBLo6+K2PPNXyNS6fbVJql7+lU4SothU XBNdKh3ODp2LSUNsYo++ylQ/2h50dcUXdqFf84EZ7zAPPPyeRjlvU1fXbgB+ZQqHU04R nI8crynG+NvylQcYA7rXy/9TbgucUVFnoA+zI8AllxyvV+0TgCbiNGdEVwXatbQXbzFN /AtkMC1WBxSlXLAbgHaXRQFreAsvHjo0tP7OpbjS8gQtRhg2/5pMBhJ48fubuirFazQR 4ET/PFSoRp25hME3gwrNg9HVWNe/qtgKShD3HHWInLGuRusDl/CyZvyv6zCajcITYiHw F77g== X-Gm-Message-State: AOJu0Yy4LLGRma/XcI39B/ONSweMdsadtcMvCV2b7tU4t4TFcw9GjXkr rNWHwFBML/yoQct7hiCJfdwo4OOxp+2Pn+K/caU= X-Google-Smtp-Source: AGHT+IFAkMOe+uliaMiEWEp4m6iO/x8LaZyZGperL4AVykoc+tvcyewEcvtNUX0KI0aficNrOJgnNQ== X-Received: by 2002:a17:903:120d:b0:1c0:bcbc:d64 with SMTP id l13-20020a170903120d00b001c0bcbc0d64mr2364650plh.51.1697817122262; Fri, 20 Oct 2023 08:52:02 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.52.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:52:01 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 16/24] libevent: fix patch Upstream-Status Date: Fri, 20 Oct 2023 05:51:18 -1000 Message-Id: <6afee5ac3b419532d290d8a0c533e5d144913e92.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:52:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189561 From: Michael Opdenacker Signed-off-by: Michael Opdenacker Signed-off-by: Richard Purdie (cherry picked from commit 8c987afb2054f24d9bf86305774c186a6e015a8f) Signed-off-by: Steve Sakoman --- ...test-retriable-tests-are-marked-failed-only-when-all-a.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch index ea17e876ea..26b707ad31 100644 --- a/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch +++ b/meta/recipes-support/libevent/libevent/0004-test-retriable-tests-are-marked-failed-only-when-all-a.patch @@ -6,7 +6,7 @@ Subject: [PATCH] test: retriable tests are marked failed only when all Fixes: #1193 -Upstream-Status: Accepted +Upstream-Status: Backport [https://github.com/libevent/libevent/commit/3daebf308a01b4b2d3fb867be3d6631f7b5a2dbb] Signed-off-by: Thomas Perrot --- From patchwork Fri Oct 20 15:51:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32678 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 AACAAC07480 for ; Fri, 20 Oct 2023 15:52:09 +0000 (UTC) Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by mx.groups.io with SMTP id smtpd.web10.57875.1697817125999021860 for ; Fri, 20 Oct 2023 08:52:06 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=D3YmWBtj; spf=softfail (domain: sakoman.com, ip: 209.85.210.173, mailfrom: steve@sakoman.com) Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-6bee11456baso859468b3a.1 for ; Fri, 20 Oct 2023 08:52:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817125; x=1698421925; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=KJo8zKN+0dzA/cLAQqZpJo98vczXap30m2ZbW5Bd+Tk=; b=D3YmWBtjW9j/lXXde3PPE8Fewljc/ckoo2szsVrFU+ON+vz4B37ers5wQGro8env+N X4u0Ff424I3WTy/wXM1ZaN6hUpx5QGxcUfM5vaMaXaXdma5/z35/M5CbnC9oKXpXCUUS U0/IB+lidU4k/yTutGKb1vg7dxyklU+RkhNpLIhvCsaTVAxJN9TDCeWrRsEBJ8CVoJSV AgfLzo4KfoYUBW3usd7V4xvIG0RWepMhNpVH1C6+yb/ODfIpRyGh5qoOYnzOCuOfSV4U 5sk61zmJWh+VYOIXG3qEfu2HACnMfyXh0X2cuhGKsv97aW+NgOHJc47WeOfSzUd35BDU b7fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817125; x=1698421925; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=KJo8zKN+0dzA/cLAQqZpJo98vczXap30m2ZbW5Bd+Tk=; b=Iixqpq2xJigFt+G/MLBLPGU1WcSuz2b2/JYbKzKYcraGDv4ZhGd087w4ijiv4nPaVY avTLOvZppFWQkiFLKNVWdvm8k1ob5ztFD9Be3sYTmwqUr96L+iI5LMMCiVe1OUR9Cvy3 RfMSoQqWsL48Fo5XJbYW0PdlrUNZ7rervYDXxhcgzwzP6yIUhuq6zs7VJdQTzrmzle3z a23Lb97F+BSHCfRbFNKVDZ9e9rVgltWF5YvKjRubZIzgUnayn22GFN5nQf8eEIHOAl+a zC79T/lh6DZeNvv3LU2zvdJueaUVKS5g/ZiYprQlEsGEWXqHQTiwaWKGDu0ewV71W/Lm hDHw== X-Gm-Message-State: AOJu0Yzo+thu+VcuPukZoCSwpE4Xh+6HNpt3AMo1VYl3dU849jT1yFcn 1n2VNHbY3PHHTQz/YGXfsE6uiea0O0u715ntdB8= X-Google-Smtp-Source: AGHT+IHmbmHtyzhBlDCnBo8A4Q0p0+28Av3J5h0wxt1XlKGl80fzVBG77brzuMZeaxMdR69eYoJc+A== X-Received: by 2002:a05:6300:8004:b0:171:8e16:ea86 with SMTP id an4-20020a056300800400b001718e16ea86mr2227331pzc.31.1697817125012; Fri, 20 Oct 2023 08:52:05 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.52.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:52:04 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 17/24] fontcache.bbclass: avoid native recipes depending on target fontconfig Date: Fri, 20 Oct 2023 05:51:19 -1000 Message-Id: <7956db86a7377bc3afefcbbb6f92aae9161df715.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:52:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189562 From: Martin Jansa * this caused liberation-font-native to depend on TUNE_PKGARCH target fontconfig because ${MLPREFIX}fontconfig-utils is added to RDEPENDS in anonymous python * the dependency tree for liberation-font-native got much shorter (just quilt-native and liberation-font-native itself): 2 after/pn-buildlist 78 before/pn-buildlist * fixes graphviz-native signature issue as well as detected with sstate-diff-machines.sh $ bitbake-diffsigs \ sstate-after/mako/x86_64-linux/graphviz-native/8.1.0.do_populate_sysroot.sigdata.184d4fd355f1e7a2d7d929ef4b5f62b94e2071df9dd674b2067ec21bfc7bcc1b \ sstate-after/qemux86-64/x86_64-linux/graphviz-native/8.1.0.do_populate_sysroot.sigdata.35da674d2dbc275bac02869dfce4165466315023910bdef65a6026e2cb942a46 Hash for task dependency liberation-fonts-native:do_populate_sysroot changed from 310d3da04ad9abf8ee99997e53d1ffa71c2b7d9d60fb0e8de85171a9ab6a77d3 to 048420ad1410c2b8d95498fc3c11681207335a2c722836f1f3e683cc449814da Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 998d4da9d89aea77dc0f2cbac60ea64258331756) Signed-off-by: Steve Sakoman --- meta/classes-recipe/fontcache.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-recipe/fontcache.bbclass b/meta/classes-recipe/fontcache.bbclass index 0d496b72dd..6f4978369d 100644 --- a/meta/classes-recipe/fontcache.bbclass +++ b/meta/classes-recipe/fontcache.bbclass @@ -13,6 +13,7 @@ PACKAGE_WRITE_DEPS += "qemu-native" inherit qemu FONT_PACKAGES ??= "${PN}" +FONT_PACKAGES:class-native = "" FONT_EXTRA_RDEPENDS ?= "${MLPREFIX}fontconfig-utils" FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" FONTCONFIG_CACHE_PARAMS ?= "-v" From patchwork Fri Oct 20 15:51:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32677 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 9F506C0032E for ; Fri, 20 Oct 2023 15:52:09 +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.web11.58044.1697817127669096799 for ; Fri, 20 Oct 2023 08:52:07 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=y6Jb9Gyz; spf=softfail (domain: sakoman.com, ip: 209.85.214.171, mailfrom: steve@sakoman.com) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1cace3e142eso3891415ad.3 for ; Fri, 20 Oct 2023 08:52:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817127; x=1698421927; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gLHlchBRaavFWGuZm31ieZupkuZW8njd6NWWnDWFpco=; b=y6Jb9Gyz7x5jBpuwk6u2rFXQVBXRsdiSBcprqBHn3Ym+OISxPPy8UE1zl5YyNrWa9C ErytOeb43cqNWekqpFSB5xmvUomsZhPm4A5zX7EQ4GgijmLaTAgNrg1m6ZOT8S6WEBjZ kNBTgn4JomZJSHy/JzygQvbc6WJuEzxCYJNCEDmxN9VOVCG8Tvef/4tLZDpNxE7B6cfD QhwCXbMBv5EJ6XVqsPY1T2O9ey7ek6M8iOButG/z3tgbD4vLEM4vNyAZ/iLeZsco5l4G 3bsr9Cp9Bx91cKutGgc6/5d1qXyy9HigSW0T56GAhk26bRKcIt7NDeDen4G0fzuhPKqw hADg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817127; x=1698421927; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gLHlchBRaavFWGuZm31ieZupkuZW8njd6NWWnDWFpco=; b=MTlqQnRT+5dJmN+vRy1BM8NW38qvsCrwviySlbr8MuFZryKbeUcxDPiao7DhliDlKM xOs/GjNiD1q6DsasQwMJAhUZNEqjrqpFdhFMUlkxnNxkTFfOcHudBHe5QnFvFF/05IIE wu3CPtkbys+JhTi6Dz622fRxe5SpqbKPocFBovNP+H3Wu6s6UV00chRIcZ6GfhHdGQ6r UNptZGSZjtxXXc6ngpCwVCnoAo4bCEvnpoE7Fak5fGabtLM/BTEqSe/8jLt/Wz5cuuuv JpL9nPv/x0qE5pDh2vUPV8EC+ujGtCS0fq95AOBuxUsZBaeA0Lp8TlYm24gPHWcD1CHn I54w== X-Gm-Message-State: AOJu0YwOWjX3pDkypzVKEmIxfkqvug4HNL23jgSv0hfYsXDcXPs52X01 bUu/zYeITliypUuOVw+59FFhiviImyIcbJ7+3IQ= X-Google-Smtp-Source: AGHT+IGoAtwi0dr6rvF9dYG0Lfm14SOzL/2Pp0OsL06Fsrluy1+qFKXSWgNaglsw7cA5AzT4PSqBUw== X-Received: by 2002:a17:902:d054:b0:1c9:d8b6:e7ad with SMTP id l20-20020a170902d05400b001c9d8b6e7admr1935809pll.56.1697817126708; Fri, 20 Oct 2023 08:52:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.52.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:52:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 18/24] insane.bbclass: Count raw bytes in shebang-size Date: Fri, 20 Oct 2023 05:51:20 -1000 Message-Id: <76efaa1e177a5051cfec87f288c8c7372f142fe2.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:52:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189563 From: Jan Garcia Operating systems limit the shebang to a maximum number of bytes. This patch makes the shebang-size check count raw bytes instead of UTF-8 characters. Signed-off-by: Jan Garcia Signed-off-by: Richard Purdie (cherry picked from commit d4ac66c5cdaf971fb717cc5c5bf9aa51a787d412) Signed-off-by: Steve Sakoman --- meta/classes-global/insane.bbclass | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass index ee34d5208d..e3a7d05ec3 100644 --- a/meta/classes-global/insane.bbclass +++ b/meta/classes-global/insane.bbclass @@ -94,9 +94,8 @@ def package_qa_check_shebang_size(path, name, d, elf, messages): return if stanza.startswith(b'#!'): - #Shebang not found try: - stanza = stanza.decode("utf-8") + stanza.decode("utf-8") except UnicodeDecodeError: #If it is not a text file, it is not a script return From patchwork Fri Oct 20 15:51:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32680 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 C9411C25B40 for ; Fri, 20 Oct 2023 15:52:09 +0000 (UTC) Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by mx.groups.io with SMTP id smtpd.web11.58046.1697817129372727633 for ; Fri, 20 Oct 2023 08:52:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=cEX4bFdk; spf=softfail (domain: sakoman.com, ip: 209.85.214.173, mailfrom: steve@sakoman.com) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-1cace3e142eso3891815ad.3 for ; Fri, 20 Oct 2023 08:52:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817128; x=1698421928; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=LC+AmC0mROVn/n5Jx3UYQ+ZeF81UHR7mNHJqhEuEc/w=; b=cEX4bFdkVaByeU2684kWKsKWEqyesM2ksvUqOT3AjUtFG3oCEpQL+ZUDNwgLk6sw2J SoEuKDuBYpWlC0vcjm8NK+mljBZlQZQliatjI2YvDD6HK+b9eR9aXVZKb9OOn8Mrns9n 7MGuu+AiDCdTGqFaChiGS35+i/cq+/zf6lScnfpOTWDgXPeZuJWXhOy9OwUbdtD/usZ6 FuIjxq+6ycCVSFQOrwpj8vGRiF5ytyRMeCDE7dkeYnj18Hq/2/nHGgtNMbEL+gAJeOoD YquBcu0ELdKIiMFnMKaEndje3WB59R19r0w+7VhO9BkbWmE84ycaQ2qnMljU52m4MRxi uiRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817128; x=1698421928; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=LC+AmC0mROVn/n5Jx3UYQ+ZeF81UHR7mNHJqhEuEc/w=; b=epmEofIuzndVltl8VthOmqUJAsp9eXOyB/+z35WnzdT9+KVSv8G2WHBCcZrCjCGkRI /lgVYHFFspnCBx0vAldY2zwLzRYPyjnJqk0ipaIc+Dn3Aux+3Q1LQZOLzkQgW/RuU3IC qGPuLN1ilZYKfhyriaN8evSOZG6SHmjAX61E+D+OVu9KUcpeAERjyl7W8PtfXtojEE4B AgGtVRigKdOYMpVwT7rewbwavzyCECe9NmITH4Gf1+qE0ncryRkQAyysymlgGQVnO8YZ b+cCiEm2eaz3B7LwR94u/S6pdkLVjfrNx2GCeUqLvYQv+wh2b/HCMxj35hn66L0g/GAT YX/w== X-Gm-Message-State: AOJu0Yy6CPEWmvPiSRlfKZMlfPp6crspgTJ5uAvsN/LIw05Zd/Jnf3K7 Y0ny1RDY/lYqDQwcL0FaLmvj6HyQnY/ZAtiEHXY= X-Google-Smtp-Source: AGHT+IFnVBxSwrflwRGXLd4tLxWnsjaSI/4lbUf+swnVaHRYq+iPETqQ7QQ7zY8Kza9s9BhhjR5CUw== X-Received: by 2002:a17:902:e88e:b0:1c5:f7e2:c5e0 with SMTP id w14-20020a170902e88e00b001c5f7e2c5e0mr2547771plg.51.1697817128567; Fri, 20 Oct 2023 08:52:08 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.52.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:52:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 19/24] oeqa/selftest: Fix broken symlink removal handling Date: Fri, 20 Oct 2023 05:51:21 -1000 Message-Id: <830412641abe8c7a3ad5eb1709c8372c796a7760.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:52:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189564 From: Richard Purdie The test above this removal correctly looks at symlinks however to remove a symlink we should call unlink(), not remove(). This avoids some build failures/tracebacks. Signed-off-by: Richard Purdie (cherry picked from commit dbdb6e73b0f52bc5f9429aca47802d51edbbc834) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/context.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/context.py b/meta/lib/oeqa/selftest/context.py index 39325f4b72..3fb357f8eb 100644 --- a/meta/lib/oeqa/selftest/context.py +++ b/meta/lib/oeqa/selftest/context.py @@ -427,7 +427,7 @@ class OESelftestTestContextExecutor(OETestContextExecutor): output_link = os.path.join(os.path.dirname(args.output_log), "%s-results.log" % self.name) if os.path.lexists(output_link): - os.remove(output_link) + os.unlink(output_link) os.symlink(args.output_log, output_link) return rc From patchwork Fri Oct 20 15:51:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32682 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 BD490C0032E for ; Fri, 20 Oct 2023 15:52:19 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.57878.1697817131116604728 for ; Fri, 20 Oct 2023 08:52:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=w0w5P3AE; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id d2e1a72fcca58-68fb85afef4so946300b3a.1 for ; Fri, 20 Oct 2023 08:52:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817130; x=1698421930; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=4/z5+OgZ3iUsVSkhPymwfe4GN/vrkQBdNnWv/bDpKKs=; b=w0w5P3AEVYegEaFqOMczQkmZ5pVzw8sOK1K7rPAaY84FDX8LS6U2XSUBqtJDQOQonE 8DZAHtM2tIybvwGzNsJadoPpTnGgoLzoLOt245tPLx38NiqIsb12EgrCadXv5OVZTR5t nKbxt3uXy+yWrnGjbkG0Cn5OljIjQe+1CFN+XHSK0JKE/Vlq6ZyAEbmiZeK/YlGeVrcP 3ZE/TYY1DumlAzXijXe/DvwL7quCVHYssAgsuyoYrmvPcWMTlbLZAI1JQ0fdRBhdfA7s PAmIPHVegQtzgJsXXETw+Wo6NgK4wj/ki1bDqikao6GwN8seni9hJ4nzmncVZ5Vp15Fg nUgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817130; x=1698421930; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4/z5+OgZ3iUsVSkhPymwfe4GN/vrkQBdNnWv/bDpKKs=; b=dZ6y4NPlwbFG4gx4ff7Bqex13J3AM6qEO0z/45DgsDx+4cuFxBpGfGFlY2DG9d6TP7 39UmpE8ZcUeOrdH5XcL1hgZOLbE+ZHLvvBW9n87HyvwqF66ty9V3Wy0sG3Va+wYgcMRh yDgMsGg1k249x1EdP75sgn69lMoYGlV/YPINf8JEc/JmYRcCVBI8kWiOiZQ/2HMl9dbT KlGJoyoenuXsVHj0W1Nu1gOZnYBx2JF2E86v6W06uVOBcTZezIV7BL/TYgHED13L/TmO XOtWgbwLbhy+DOw65AEnoour2KjQx4G1oqY0YDy5dIlfQpIiGi/aj6v/4SNZOjBD/8mH PvvQ== X-Gm-Message-State: AOJu0Yx0izxQ1+UKyB7jnKQ8kU1igm2brWdQcLsC8XEDUFrqhWu0Yqd7 fb/OD90HdEpl6uVVJWzLw6oaZ96g8mhbBrjejcE= X-Google-Smtp-Source: AGHT+IFGjbzdAA0xWNpBUXfDl95svzznC9zrp0Scb4HP6M8ayRK9o62y8BmvFLHKBSgzRYW+2K+VzA== X-Received: by 2002:a05:6a21:3d88:b0:14e:a1f0:a8ea with SMTP id bj8-20020a056a213d8800b0014ea1f0a8eamr2159534pzc.3.1697817130247; Fri, 20 Oct 2023 08:52:10 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.52.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:52:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 20/24] oeqa/utils/gitarchive: Handle broken commit counts in results repo Date: Fri, 20 Oct 2023 05:51:22 -1000 Message-Id: <27c1ad02b9479f30ad8eacdee1cdad79cab5269d.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:52:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189565 From: Richard Purdie The test results repository contains tags like: master/64501-g65c94ca3196e5ef3344a469fea8e30444f2e967a/0 master/1-g65c94ca3196e5ef3344a469fea8e30444f2e967a/3 master/1-g65c94ca3196e5ef3344a469fea8e30444f2e967a/2 master/1-g65c94ca3196e5ef3344a469fea8e30444f2e967a/1 master/1-g65c94ca3196e5ef3344a469fea8e30444f2e967a/0 where the commit count is correct in one case and not in the others. This causes assertion errors in the current code. Add in some code to work around these historical issues where the commit counts are low. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni (cherry picked from commit d51fc5c8c469730885af7bbde7122032de411d89) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/gitarchive.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/utils/gitarchive.py b/meta/lib/oeqa/utils/gitarchive.py index 73beafecb5..6046f183d5 100644 --- a/meta/lib/oeqa/utils/gitarchive.py +++ b/meta/lib/oeqa/utils/gitarchive.py @@ -221,7 +221,15 @@ def get_test_revs(log, repo, tag_name, **kwargs): if not commit in revs: revs[commit] = TestedRev(commit, commit_num, [tag]) else: - assert commit_num == revs[commit].commit_number, "Commit numbers do not match" + if commit_num != revs[commit].commit_number: + # Historically we have incorrect commit counts of '1' in the repo so fix these up + if int(revs[commit].commit_number) < 5: + tags = revs[commit].tags + revs[commit] = TestedRev(commit, commit_num, [tags]) + elif int(commit_num) < 5: + pass + else: + sys.exit("Commit numbers for commit %s don't match (%s vs %s)" % (commit, commit_num, revs[commit].commit_number)) revs[commit].tags.append(tag) # Return in sorted table From patchwork Fri Oct 20 15:51:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32681 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 B6B22CDB474 for ; Fri, 20 Oct 2023 15:52:19 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web11.58048.1697817132842106936 for ; Fri, 20 Oct 2023 08:52:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=vYl9NSZK; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1cac925732fso5889205ad.1 for ; Fri, 20 Oct 2023 08:52:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817132; x=1698421932; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=iSvsmW1Tw3PgeE+9dWvG04pq2sLjCCmJf4u4CLV9c3E=; b=vYl9NSZK9nRB2oLin4cVWxtbLAn2KkpMZzY/7ZNPMHHz0/xLAJiPZPby7h3ye4nRVO 1FbPbf8aLOVoIUO5APszo5TnU6eNnzTPZzJRY3kv6Mgs6HahH+vPoWJNAmdzbNHQ5++7 dtl5XMIqNBZFVY3IgSkkQ3G8WyKIYRbWNV6LcONiMTD/bfx0hnArk5pYGBItlhpQAqMp olxE2YQijGskJY76+Sdc2OWGMWcSnIqxVmLDyOrJdpXoUIEA0+L0z+bng0xDu2s8YIDY jvH1GMYbslQ64lHenQ4bAgOhF4OWA6cnzh2wsjdpZl/gLRq5mYemSh60FM4wQPyP3zOA Sw0Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817132; x=1698421932; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iSvsmW1Tw3PgeE+9dWvG04pq2sLjCCmJf4u4CLV9c3E=; b=RA8ExK+T0PB3Zk4ztUusPS14s5GXKrWozoN3/hs8Of6CnA2ob9JlVQFMSqFGj+13rY nEpXfJioGxkBEL8r2jXR8aL+qtPrO/XSnBy4G0J7Sp8CudvxIFYzkqZBI0kXEsThm0wf ALs+/47aapLCsXMbjqolkxPGexmvSj5qmu8TJPCYjewvKNUflG97RFZSjEy1pmUj8he1 qX6CwQ9AEY/4s4YhVIPYnyxueNnj1drOaobM3it/vFfB6Y2fdCsVn9SXk2+5XGLzeiXg xYSzLUKfOvSpUfzEr7zgy20jjVRj+s5jMqY7If2j9NrATsioAGe7ldUshK0qbvZMO1qV XvQw== X-Gm-Message-State: AOJu0YwI7Rn6hVHLA5vtzAfowKdhcf9qsxHqAXTI+SWYFI+psblXZMsn QnnZ7Mwqe1G692/HFe3PxS1+kWLgMZuys2CbQA0= X-Google-Smtp-Source: AGHT+IGYq4FNs2fwKQaPOz0DtTKaVFo+b4lbaIMaZ5N3G+/mhAvAo1JXG1NrOX55Ir3UFnTeBXIsxw== X-Received: by 2002:a17:902:e889:b0:1ca:478a:4a38 with SMTP id w9-20020a170902e88900b001ca478a4a38mr1849172plg.47.1697817131970; Fri, 20 Oct 2023 08:52:11 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.52.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:52:11 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 21/24] wic: bootimg-partition: Fix file name in debug message Date: Fri, 20 Oct 2023 05:51:23 -1000 Message-Id: X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:52:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189566 From: Daniel Semkowicz Debug message about using custom configuration file includes file name with incorrect extension. Correct file name to "extlinux.conf". Signed-off-by: Daniel Semkowicz Signed-off-by: Richard Purdie (cherry picked from commit dd63e1520454b2d53a48b72eaae126059af9809b) Signed-off-by: Steve Sakoman --- scripts/lib/wic/plugins/source/bootimg-partition.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py index 8956162205..58f6da72c3 100644 --- a/scripts/lib/wic/plugins/source/bootimg-partition.py +++ b/scripts/lib/wic/plugins/source/bootimg-partition.py @@ -112,7 +112,7 @@ class BootimgPartitionPlugin(SourcePlugin): # Use a custom configuration for extlinux.conf extlinux_conf = custom_cfg logger.debug("Using custom configuration file " - "%s for extlinux.cfg", configfile) + "%s for extlinux.conf", configfile) else: raise WicError("configfile is specified but failed to " "get it from %s." % configfile) From patchwork Fri Oct 20 15:51:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32685 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 C4F8DC00A98 for ; Fri, 20 Oct 2023 15:52:19 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.57880.1697817135695544203 for ; Fri, 20 Oct 2023 08:52:15 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=uw/U7Z1K; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1c9daca2b85so7750905ad.1 for ; Fri, 20 Oct 2023 08:52:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817135; x=1698421935; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=5syXoWkkevSSOFf+sDs+nIIDJ4xb142zFpS9E3hyZuc=; b=uw/U7Z1Kfvktp2r6oQuaWBUs30DZ2gKonmtnqj+mUmACMzQ1H/qGZjwZ0sDjHVRj1l nyAfVdYDXHlAZbrnrnRvlgyFq7kQcdfKexEb3YKcrfsubrKPJ1KakbXplbW95I7oG5dt CKT20ZKqM4LD4OqsDkT8uttSK91FsoLZHIfg1nnKKyRb+J5PIEyeI5uCJAV9GSYRkw8X 2fJyEiqWPsqhQzhuu+NkqttWwkQFBAX/eeyldRaIGEzVx6TWupeJQEANSTg3c5yZ8n8+ 9zVPVPU2y+J06/9+MDvVeQ43wUKLEy5+2YJL9GNtvboyl/p0GIAb0yLbaJqcLQ6qqWPQ eUfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817135; x=1698421935; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=5syXoWkkevSSOFf+sDs+nIIDJ4xb142zFpS9E3hyZuc=; b=iYojtTKNy0I5ncotfGgGHeNqd5ktbU4Mz8H9H5dEz6ZWNFHQNlKoxsZXFaWgwJ9eYB T6L4i4NPdAoyanokTcpZIro/hsAnbD6Nsol0sewbteqj9ORYnsd7dWjT5UMJ65/pD51q vJXUYbc2GA7N1Ll4tYaR3u2W6kCmFsTdZwCmYoxdHolzob5zhi2eeQUvnTEt6WAkrvL/ YOhz3aVDcIDLK1EddHikILnDOGFzm955wAXSfh2IJo3Y7O1O9GKXg6MO6HF2I3i45Wsr dxQc1/ZMHlrgXQiyypCQxBKsn4jevEGJxeqGrkY/v6MxHuBt6JtwuFHt4UlJy0s2R3mo D1lw== X-Gm-Message-State: AOJu0YwmvCkU147uVdPqUVMoNxPBpTaBYCrXH/TsxT2YTFoHUWZ2dISU LV404dHZYRZqmsr4qeJ/++QU4VecLoXf2ctySiQ= X-Google-Smtp-Source: AGHT+IGxZagZlXfv7DfDNqngVb74gBVCtcPeKt3Zcsk3Werd1Hhsme/J5SDYeifnaiSBRLWIoH52Bg== X-Received: by 2002:a17:902:da91:b0:1c6:de7:add9 with SMTP id j17-20020a170902da9100b001c60de7add9mr3082076plx.19.1697817134775; Fri, 20 Oct 2023 08:52:14 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.52.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:52:14 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 22/24] oeqa/concurrencytest: Remove invalid buffering option Date: Fri, 20 Oct 2023 05:51:24 -1000 Message-Id: X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:52:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189567 From: Richard Purdie Fix warnings from oe-selftest -j: /usr/lib/python3.10/os.py:1030: RuntimeWarning: line buffering (buffering=1) isn't supported in binary mode, the default buffer size will be used return io.open(fd, mode, buffering, encoding, *args, **kwargs) Remove the option since it clearly doesn't do much. Signed-off-by: Richard Purdie (cherry picked from commit 6b872ee72942951fd464c4c6cb9eadcb9b4749c1) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/core/utils/concurrencytest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/core/utils/concurrencytest.py b/meta/lib/oeqa/core/utils/concurrencytest.py index 4f77589b00..3ac5a6dd7c 100644 --- a/meta/lib/oeqa/core/utils/concurrencytest.py +++ b/meta/lib/oeqa/core/utils/concurrencytest.py @@ -263,7 +263,7 @@ def fork_for_tests(concurrency_num, suite): ourpid = os.getpid() try: newbuilddir = None - stream = os.fdopen(c2pwrite, 'wb', 1) + stream = os.fdopen(c2pwrite, 'wb') os.close(c2pread) (builddir, newbuilddir) = suite.setupfunc("-st-" + str(ourpid), selftestdir, process_suite) @@ -308,7 +308,7 @@ def fork_for_tests(concurrency_num, suite): os._exit(0) else: os.close(c2pwrite) - stream = os.fdopen(c2pread, 'rb', 1) + stream = os.fdopen(c2pread, 'rb') # Collect stdout/stderr into an io buffer output = io.BytesIO() testserver = ProtocolTestCase(stream, passthrough=output) From patchwork Fri Oct 20 15:51:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32684 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 D2A8BC001DF for ; Fri, 20 Oct 2023 15:52:19 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.57881.1697817137544542773 for ; Fri, 20 Oct 2023 08:52:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=ccI156TW; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-1c9e06f058bso16058965ad.0 for ; Fri, 20 Oct 2023 08:52:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817137; x=1698421937; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=i14spCegnkOaystV7bFcD7sRd0gvihmgOEpT61Fa6QM=; b=ccI156TWIUFR0wIoVhgMGtlamNbH41cZXURytNK9gQPsdaCGvg+zCkojhbW3H0mTsl xa8idVc/htBIl77cgVIcwiOyPC+GSwr6ljwA/Ypj/2KKzF++J5wYT7tixoI+4T+4KcSw B1tVkauUfIhPmCoAQpDeTOyf+dntLDEU13YRS4g14tJ26Qo//WQTTlBMk9Gs77Us10dz wuTthLgH/UYEvScGtqYhnVzVG76umK+loxtw9rRnDEx+t7Mw4SmZw8UK92m/+wPPmnld OKxgByJRxtSG6kZw9ccxWETtanATLkurqvvkvVp/zG8PGw5gucU9Zu5HH+TybWDGGW4R 357g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817137; x=1698421937; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=i14spCegnkOaystV7bFcD7sRd0gvihmgOEpT61Fa6QM=; b=pry6c1YmjqGWpm3/wUy+P3sJ5MSFDjQPcze/J0kz0+2wnCLrp0VwZZi2FexVMt4Y0T V12ASUkFUk4iEJSRnB07h6Xr4Xhba6rt4lTp8WOwUVJg/9nHhkdO1ZnZ9QngpAgG1rRN RIOYPfasqB89p9rm6m/Ediu92g5wa9+wKDAzjgfBiwMpkZIomb0XqLUmkmru2Fbo+vr6 iJZpm8QA4Kj0NutGmVKAiyaKzmpDPjb934xrhJIZ/VeOq+cxmJeJiGOz6cZXMfFgWSKI bo/hVkrxMtOe0YBLFvesFjfHug8kHcbkyaKM8Lmz3bDM3EsACyPQaWSu9stGpl4g5tqE 8Azw== X-Gm-Message-State: AOJu0YwQxKfIAw0jLyNz0Zif/gt4aITh8L0Z9+Q9DkiWQ4wuuR/1RqW0 P8aVDgpcef0Im1pVjZVx9mwt2T725w2x52D2xeE= X-Google-Smtp-Source: AGHT+IEqOmmHulh5aNKL3vqSkLBDfTY2IFj9QMjyTeolW5h2+hIlFMAkmtcEm+pFP9ijqqJqPK+MFA== X-Received: by 2002:a17:902:dac5:b0:1c0:cbaf:6954 with SMTP id q5-20020a170902dac500b001c0cbaf6954mr3798241plx.25.1697817136717; Fri, 20 Oct 2023 08:52:16 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.52.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:52:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 23/24] packages.bbclass: Correct the check for conflicts with renamed packages Date: Fri, 20 Oct 2023 05:51:25 -1000 Message-Id: <3fc3e55933716ce9cfa8b2e8e4cc8fa2e94a0061.1697816789.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:52:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189568 From: Peter Kjellerstedt The original solution replaced all overrides with the package name that was being checked. This can have unforseen consequences where some variable involved in defining the value for the PKG: variable may rely on some override which is not set as expected. It also meant that any PKG variable set using an override would not be caught, e.g., PKG:${PN}:${MACHINE} = "${PN}-dev" (made up example that would always fail with the old code). Signed-off-by: Peter Kjellerstedt Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit de62d538dbfe6caf123ff366643f893077175583) Signed-off-by: Steve Sakoman --- meta/classes-global/package.bbclass | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass index e8055a9cdc..08eb56dc3d 100644 --- a/meta/classes-global/package.bbclass +++ b/meta/classes-global/package.bbclass @@ -499,11 +499,9 @@ python do_package () { # Check for conflict between renamed packages and existing ones # for each package in PACKAGES, check if it will be renamed to an existing one for p in packages: - localdata = bb.data.createCopy(d) - localdata.setVar('OVERRIDES', p) - rename = localdata.getVar('PKG') - if (rename != None) and rename in packages: - bb.fatal('package "%s" is renamed to "%s" using PKG:%s, but package name already exists'%(p,rename,p)) + rename = d.getVar('PKG:%s' % p) + if rename and rename in packages: + bb.fatal('package "%s" is renamed to "%s" using PKG:%s, but package name already exists' % (p, rename, p)) ########################################################################### # Optimisations From patchwork Fri Oct 20 15:51:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 32683 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 E21EDC07480 for ; Fri, 20 Oct 2023 15:52:19 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.58049.1697817139199900256 for ; Fri, 20 Oct 2023 08:52:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20230601.gappssmtp.com header.s=20230601 header.b=yiBA4d4F; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id d9443c01a7336-1c9d922c039so7790955ad.3 for ; Fri, 20 Oct 2023 08:52:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20230601.gappssmtp.com; s=20230601; t=1697817138; x=1698421938; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gdTwX6JATSeDgIqIcn8fSrm0gk8wtpBj+5XBID+i6Y8=; b=yiBA4d4FmitXGiX6k1trNpXSbvrHQySsww0INUU0JvR1/qvtxEUz6ktvjFz48GOgwW rwvF9iJBmRtp68csLkd5AlPXyb6SQHUMZ8OvPEQwMqY60VcXFbQJx1TBTkTRTicwBEaG dztL6Wgv9EcmvfqLgF2Otk1UETbOZn2rcVqGbNR+nEIDzPFSGL3pEkXGuplqIn+ThwbQ 7eBzJNZEf7oaDtoJu+4lXXx3lFYYT9QfxRXG86EAkH7IkBlac83jCKcFiOOnzbwOEVD5 z280HGjrDWh3euTQOXWxJ6LHrOzZI14kVW47iO2Mk/ZkwYoftUyQ+cR/yyaxexACL7gC teEg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697817138; x=1698421938; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=gdTwX6JATSeDgIqIcn8fSrm0gk8wtpBj+5XBID+i6Y8=; b=A5IyzN29yUxLYddzvDee//neZFUsE39z4WbpjdcTGMAIZjaxahCnXWHut7wOXtYXnQ mdMPiPXT5SvNSTZ+Qw5acp06Rj8YDlAHxbQb8Z9cXw3e30oC3BIvC0UJHLtlYHYdxXZQ vqaB02pBENRa5uwjtB//Q49sHYy2F809WQZ4dle//oufxQAaXyUZJumg9X0a1scjuV/v f7+PU/X3NpdM+gRCN01FguH/WdWWskHs16nx8GG34/twLlBUKg0xIkYrHhXmu/ypR6J0 BRJKenQfih4+VFxzGkgyPeUs1dm06C+BM7xHgKXjo1DJRCFBbgFTp/npjMGTrn90zG+G Wwlw== X-Gm-Message-State: AOJu0Yw3uBzsWM8T7lnFJ4O3GNIDGxvGvepr1AUTtefPFsCIRHHkAX3n /daSDi4yEyie0+IarEyrp1vSNf++JmGitSrpGdY= X-Google-Smtp-Source: AGHT+IEKmT14CCeNp8s3QTigBCUCPMWeFT1T2J8y+vM4wKRVj3HjzzdlKh8fYO6pZSMz2CgIhQrpVA== X-Received: by 2002:a17:902:f685:b0:1c9:bca2:d653 with SMTP id l5-20020a170902f68500b001c9bca2d653mr2174109plg.11.1697817138315; Fri, 20 Oct 2023 08:52:18 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q12-20020a170902dacc00b001c71ec1866fsm1679244plx.258.2023.10.20.08.52.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 20 Oct 2023 08:52:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][mickledore 24/24] busybox: Set PATH in syslog initscript Date: Fri, 20 Oct 2023 05:51:26 -1000 Message-Id: X-Mailer: git-send-email 2.34.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, 20 Oct 2023 15:52:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/189569 From: Martijn de Gouw This script is not always called with /sbin and /usr/sbin in the PATH already, for example when called via ssh. Explicitly set PATH to make sure it includes /sbin and /usr/sbin since that's where start-stop-daemon is located. Signed-off-by: Martijn de Gouw Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit fa53f898eaba15dff030f9eadf86e5bca7d954fa) Signed-off-by: Steve Sakoman --- meta/recipes-core/busybox/files/syslog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-core/busybox/files/syslog b/meta/recipes-core/busybox/files/syslog index 2208613e8c..a4fea30ab7 100644 --- a/meta/recipes-core/busybox/files/syslog +++ b/meta/recipes-core/busybox/files/syslog @@ -10,6 +10,8 @@ set -e +PATH="/bin:/usr/bin:/sbin:/usr/sbin" + if [ -f /etc/syslog-startup.conf ]; then . /etc/syslog-startup.conf LOG_LOCAL=0