From patchwork Tue Jul 18 16:00:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27658 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 84156EB64DA for ; Tue, 18 Jul 2023 16:01:20 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web11.11595.1689696077251409141 for ; Tue, 18 Jul 2023 09:01:17 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=igHzJs4I; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-666e5f0d60bso3741328b3a.3 for ; Tue, 18 Jul 2023 09:01:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696076; x=1692288076; 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=Cg9A+b8gyjN0xuWM5fadZbmouT/jBuhjvLUrZZV/mFk=; b=igHzJs4I73UJY0XJKoDnprYJAKtmz0ZLqV+azhd+mK9Are5b85aZz+6/vnigM2DzuF nE2M5958CpL+wEvRmbgMC7rpHBpiwR72NpK2s5ytP3pIE/hKOIHyfELj+2IdzV8+2Euy QtR1rgCXYmgR7i7R0BYTDvqB7uqidY+CPZjB+ewCVV1gq7uJobMn2LbOZixGxWrisyzz 3Rfbyks48zAyd53IpcKiUCR78gOmREVo3Xpor11C+Ao83TifLXU3AVgW6jRGv51PJos4 O4qSjeT+XzaD8tb0o+Gy808N6f91YCgY+2Pi+0j7QIBJHubU1byRV1EpcngTKIqWcWN/ Nrxw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696076; x=1692288076; 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=Cg9A+b8gyjN0xuWM5fadZbmouT/jBuhjvLUrZZV/mFk=; b=B980T6tuiDClKisFUxWihcaB9Mgxp5pNByhw5xk0KtgIzXPnscR5r6R/VydERUfVhE emR52JRjvG9YIGwDBPY6nrgg60mwPpz3YWBeqCpYNrVXf51Z7GJv66VnJqdLFsv8pwc4 hzp5fGijCj1i689um0iwKp9KR4K5stAJCghHpbgA/opdFnPQ7sDqFNN7G9L3yuugWtHe GDJrIiu7TB92eAF6lEk7SDvoA5+WwC6C6JCSXlcICCMEpsKWiydLTcAoqB3KQVIWKux2 TXDQcq1Y78XerXJwEGa5yuTPp3HFMRQdw70ZLsTEvUSXOw9ylMlY3G/jfXK+KtiBbqMf curg== X-Gm-Message-State: ABy/qLZfdF5lqd8aYeFslE33PQTROm+ZSnZ5kzWgMORDZD7XIDMnLDWM P2uiXCtyRg+BelpwWDrWUH1WFN1f3y9QQ0L8JV4= X-Google-Smtp-Source: APBJJlEpa0ubYkGBI6pmBS2HSll9VXBeiyZtWUzgDJOP2QvUiM/bU/olFk60vmqRRG3O+YKsZVflgQ== X-Received: by 2002:a05:6a20:1612:b0:12f:1d09:f1c3 with SMTP id l18-20020a056a20161200b0012f1d09f1c3mr15433708pzj.54.1689696076189; Tue, 18 Jul 2023 09:01:16 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 01/13] libx11: Fix CVE-2023-3138 for dunfell branch Date: Tue, 18 Jul 2023 06:00:52 -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 ; Tue, 18 Jul 2023 16:01:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184538 From: Poonam Jadhav Add patch to fix CVE-2023-3138 for dunfell branch Link: https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/304a654a0d57bf0f00d8998185f0360332cfa36c.patch Signed-off-by: Poonam Jadhav Signed-off-by: Steve Sakoman --- .../xorg-lib/libx11/CVE-2023-3138.patch | 111 ++++++++++++++++++ .../recipes-graphics/xorg-lib/libx11_1.6.9.bb | 1 + 2 files changed, 112 insertions(+) create mode 100644 meta/recipes-graphics/xorg-lib/libx11/CVE-2023-3138.patch diff --git a/meta/recipes-graphics/xorg-lib/libx11/CVE-2023-3138.patch b/meta/recipes-graphics/xorg-lib/libx11/CVE-2023-3138.patch new file mode 100644 index 0000000000..c724cf8fdd --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libx11/CVE-2023-3138.patch @@ -0,0 +1,111 @@ +From 304a654a0d57bf0f00d8998185f0360332cfa36c Mon Sep 17 00:00:00 2001 +From: Alan Coopersmith +Date: Sat, 10 Jun 2023 16:30:07 -0700 +Subject: [PATCH] InitExt.c: Add bounds checks for extension request, event, & + error codes + +Fixes CVE-2023-3138: X servers could return values from XQueryExtension +that would cause Xlib to write entries out-of-bounds of the arrays to +store them, though this would only overwrite other parts of the Display +struct, not outside the bounds allocated for that structure. + +Reported-by: Gregory James DUCK +Signed-off-by: Alan Coopersmith + +CVE: CVE-2023-3138 +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/lib/libx11/-/commit/304a654a0d57bf0f00d8998185f0360332cfa36c.patch] +Signed-off-by: Poonam Jadhav +--- + src/InitExt.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + +diff --git a/src/InitExt.c b/src/InitExt.c +index 4de46f15..afc00a6b 100644 +--- a/src/InitExt.c ++++ b/src/InitExt.c +@@ -33,6 +33,18 @@ from The Open Group. + #include + #include + ++/* The X11 protocol spec reserves events 64 through 127 for extensions */ ++#ifndef LastExtensionEvent ++#define LastExtensionEvent 127 ++#endif ++ ++/* The X11 protocol spec reserves requests 128 through 255 for extensions */ ++#ifndef LastExtensionRequest ++#define FirstExtensionRequest 128 ++#define LastExtensionRequest 255 ++#endif ++ ++ + /* + * This routine is used to link a extension in so it will be called + * at appropriate times. +@@ -242,6 +254,12 @@ WireToEventType XESetWireToEvent( + WireToEventType proc) /* routine to call when converting event */ + { + register WireToEventType oldproc; ++ if (event_number < 0 || ++ event_number > LastExtensionEvent) { ++ fprintf(stderr, "Xlib: ignoring invalid extension event %d\n", ++ event_number); ++ return (WireToEventType)_XUnknownWireEvent; ++ } + if (proc == NULL) proc = (WireToEventType)_XUnknownWireEvent; + LockDisplay (dpy); + oldproc = dpy->event_vec[event_number]; +@@ -263,6 +281,12 @@ WireToEventCookieType XESetWireToEventCookie( + ) + { + WireToEventCookieType oldproc; ++ if (extension < FirstExtensionRequest || ++ extension > LastExtensionRequest) { ++ fprintf(stderr, "Xlib: ignoring invalid extension opcode %d\n", ++ extension); ++ return (WireToEventCookieType)_XUnknownWireEventCookie; ++ } + if (proc == NULL) proc = (WireToEventCookieType)_XUnknownWireEventCookie; + LockDisplay (dpy); + oldproc = dpy->generic_event_vec[extension & 0x7F]; +@@ -284,6 +308,12 @@ CopyEventCookieType XESetCopyEventCookie( + ) + { + CopyEventCookieType oldproc; ++ if (extension < FirstExtensionRequest || ++ extension > LastExtensionRequest) { ++ fprintf(stderr, "Xlib: ignoring invalid extension opcode %d\n", ++ extension); ++ return (CopyEventCookieType)_XUnknownCopyEventCookie; ++ } + if (proc == NULL) proc = (CopyEventCookieType)_XUnknownCopyEventCookie; + LockDisplay (dpy); + oldproc = dpy->generic_event_copy_vec[extension & 0x7F]; +@@ -305,6 +335,12 @@ EventToWireType XESetEventToWire( + EventToWireType proc) /* routine to call when converting event */ + { + register EventToWireType oldproc; ++ if (event_number < 0 || ++ event_number > LastExtensionEvent) { ++ fprintf(stderr, "Xlib: ignoring invalid extension event %d\n", ++ event_number); ++ return (EventToWireType)_XUnknownNativeEvent; ++ } + if (proc == NULL) proc = (EventToWireType) _XUnknownNativeEvent; + LockDisplay (dpy); + oldproc = dpy->wire_vec[event_number]; +@@ -325,6 +361,12 @@ WireToErrorType XESetWireToError( + WireToErrorType proc) /* routine to call when converting error */ + { + register WireToErrorType oldproc = NULL; ++ if (error_number < 0 || ++ error_number > LastExtensionError) { ++ fprintf(stderr, "Xlib: ignoring invalid extension error %d\n", ++ error_number); ++ return (WireToErrorType)_XDefaultWireError; ++ } + if (proc == NULL) proc = (WireToErrorType)_XDefaultWireError; + LockDisplay (dpy); + if (!dpy->error_vec) { +-- +GitLab diff --git a/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb b/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb index ad3fab1204..568162a911 100644 --- a/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb +++ b/meta/recipes-graphics/xorg-lib/libx11_1.6.9.bb @@ -18,6 +18,7 @@ SRC_URI += "file://Fix-hanging-issue-in-_XReply.patch \ file://CVE-2021-31535.patch \ file://CVE-2022-3554.patch \ file://CVE-2022-3555.patch \ + file://CVE-2023-3138.patch \ " SRC_URI[md5sum] = "55adbfb6d4370ecac5e70598c4e7eed2" From patchwork Tue Jul 18 16:00:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27659 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 81EBEEB64DC for ; Tue, 18 Jul 2023 16:01:20 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.11596.1689696079980337254 for ; Tue, 18 Jul 2023 09:01:20 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=ON4J6/e5; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-66c729f5618so5920703b3a.1 for ; Tue, 18 Jul 2023 09:01:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696079; x=1692288079; 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=8R/WRKZG51pueBDh+3F5JQS7ywwe/Hc2MCYLI7m4r2g=; b=ON4J6/e5Lr56XtJCj12oX0TleXxPEsYoqFOHMGTpmHu8ulU+FT5h5ZjCcExHsJ15J2 63M3SWLK43qKmIQb93RNenae2f39YqRS3KZWwblwNd6yRk9ok/YEV5w4bQpgYEr/QowR fpYFA9H0tqTIbgbVZiNcHMJmy36ZwaAPmDVpapXktCZUf/hJgDWrWv6Z5C1sM7rDu88P wbfRt2CVC17UobdSoP/Y+jMexWZe+6ovoHVoDJO3aChXBU8R/tX4Q3UATSO69Xd2RnKM d3+kTEmuVQIkv1bKTAlP49f9WGiR7fFVd5LJdIxcI9mvhjK0V5DchmnW3SpyhcDjrqIi htHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696079; x=1692288079; 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=8R/WRKZG51pueBDh+3F5JQS7ywwe/Hc2MCYLI7m4r2g=; b=f5vYokbe2wkRtM5KvNdn1Fwsdb4CU7Ky+SadLek3m+EyHmP/koS34Z/v5bmtwUxJqP vKr23YvHb4ive//tC58a0J6IAucbaikUnL6jItn3Dm2jbuclNOHycF0Jn05dpJmsoToG UHCjHYnHTKrbbqFGQkB2IUnF5bjc4oByM3HHkAMkT25MON1UtC5qcVStHj3eg+6auJU5 ahBoeXs2VpGA6XfwDn/0YFoxa/pgBRXPmk9ZVRjC4yeolZCiSRGhLbGCul1Qdn881Huw xMlgkmULiYi2r3QjlMmetysyKyU6BUbtt6yE4WTHWIbJmV+TC4io4csN9NAjGC3Xl8eU 7/kA== X-Gm-Message-State: ABy/qLZjfKx5luYJBbVTB7vz+QixS3zRjyTTn5PuULprCzpk7yi8j6zR oY3Na0yIuIBk7WnZAJ28M9usVf/rq401tkwxli4= X-Google-Smtp-Source: APBJJlFfsdo/t7IA4unrOfq1EQY6R5tPljcuAN+N1Xn/fyayONfjVTcKBv4b/TZOb6Esn2XUfdOVaQ== X-Received: by 2002:a05:6a21:3297:b0:134:ecc3:8d04 with SMTP id yt23-20020a056a21329700b00134ecc38d04mr7589875pzb.9.1689696078812; Tue, 18 Jul 2023 09:01:18 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 02/13] go: Fix CVE-2023-29400 Date: Tue, 18 Jul 2023 06:00:53 -1000 Message-Id: <02a0e76e04ddbbbb381202d61cbb084333336f38.1689690585.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 ; Tue, 18 Jul 2023 16:01:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184539 From: Ashish Sharma emit filterFailsafe for empty unquoted attr value Signed-off-by: Ashish Sharma Signed-off-by: Steve Sakoman --- meta/recipes-devtools/go/go-1.14.inc | 1 + .../go/go-1.14/CVE-2023-29400.patch | 94 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 meta/recipes-devtools/go/go-1.14/CVE-2023-29400.patch diff --git a/meta/recipes-devtools/go/go-1.14.inc b/meta/recipes-devtools/go/go-1.14.inc index ea7b9ea80f..33b53b1a34 100644 --- a/meta/recipes-devtools/go/go-1.14.inc +++ b/meta/recipes-devtools/go/go-1.14.inc @@ -67,6 +67,7 @@ SRC_URI += "\ file://CVE-2023-29405-2.patch \ file://CVE-2023-29402.patch \ file://CVE-2023-29404.patch \ + file://CVE-2023-29400.patch \ " SRC_URI_append_libc-musl = " file://0009-ld-replace-glibc-dynamic-linker-with-musl.patch" diff --git a/meta/recipes-devtools/go/go-1.14/CVE-2023-29400.patch b/meta/recipes-devtools/go/go-1.14/CVE-2023-29400.patch new file mode 100644 index 0000000000..092c7aa0ff --- /dev/null +++ b/meta/recipes-devtools/go/go-1.14/CVE-2023-29400.patch @@ -0,0 +1,94 @@ +From 0d347544cbca0f42b160424f6bc2458ebcc7b3fc Mon Sep 17 00:00:00 2001 +From: Roland Shoemaker +Date: Thu, 13 Apr 2023 14:01:50 -0700 +Subject: [PATCH] html/template: emit filterFailsafe for empty unquoted attr + value + +An unquoted action used as an attribute value can result in unsafe +behavior if it is empty, as HTML normalization will result in unexpected +attributes, and may allow attribute injection. If executing a template +results in a empty unquoted attribute value, emit filterFailsafe +instead. + +Thanks to Juho Nurminen of Mattermost for reporting this issue. + +Fixes #59722 +Fixes CVE-2023-29400 + +Change-Id: Ia38d1b536ae2b4af5323a6c6d861e3c057c2570a +Reviewed-on: https://team-review.git.corp.google.com/c/golang/go-private/+/1826631 +Reviewed-by: Julie Qiu +Run-TryBot: Roland Shoemaker +Reviewed-by: Damien Neil +Reviewed-on: https://go-review.googlesource.com/c/go/+/491617 +Run-TryBot: Carlos Amedee +Reviewed-by: Dmitri Shuralyov +Reviewed-by: Dmitri Shuralyov +TryBot-Result: Gopher Robot + +Upstream-Status: Backport from [https://github.com/golang/go/commit/0d347544cbca0f42b160424f6bc2458ebcc7b3fc] +CVE: CVE-2023-29400 +Signed-off-by: Ashish Sharma +--- + src/html/template/escape.go | 5 ++--- + src/html/template/escape_test.go | 15 +++++++++++++++ + src/html/template/html.go | 3 +++ + 3 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/src/html/template/escape.go b/src/html/template/escape.go +index 4ba1d6b31897e..a62ef159f0dcd 100644 +--- a/src/html/template/escape.go ++++ b/src/html/template/escape.go +@@ -382,9 +382,8 @@ func normalizeEscFn(e string) string { + // for all x. + var redundantFuncs = map[string]map[string]bool{ + "_html_template_commentescaper": { +- "_html_template_attrescaper": true, +- "_html_template_nospaceescaper": true, +- "_html_template_htmlescaper": true, ++ "_html_template_attrescaper": true, ++ "_html_template_htmlescaper": true, + }, + "_html_template_cssescaper": { + "_html_template_attrescaper": true, +diff --git a/src/html/template/escape_test.go b/src/html/template/escape_test.go +index 3dd212bac9406..f8b2b448f2dfa 100644 +--- a/src/html/template/escape_test.go ++++ b/src/html/template/escape_test.go +@@ -678,6 +678,21 @@ func TestEscape(t *testing.T) { + ``, + ``, + }, ++ { ++ "unquoted empty attribute value (plaintext)", ++ "

", ++ "

", ++ }, ++ { ++ "unquoted empty attribute value (url)", ++ "

", ++ "

", ++ }, ++ { ++ "quoted empty attribute value", ++ "

", ++ "

", ++ }, + } + + for _, test := range tests { +diff --git a/src/html/template/html.go b/src/html/template/html.go +index bcca0b51a0ef9..a181699a5bda8 100644 +--- a/src/html/template/html.go ++++ b/src/html/template/html.go +@@ -14,6 +14,9 @@ import ( + // htmlNospaceEscaper escapes for inclusion in unquoted attribute values. + func htmlNospaceEscaper(args ...interface{}) string { + s, t := stringify(args...) ++ if s == "" { ++ return filterFailsafe ++ } + if t == contentTypeHTML { + return htmlReplacer(stripTags(s), htmlNospaceNormReplacementTable, false) + } + From patchwork Tue Jul 18 16:00:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27663 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 6F8BEEB64DC for ; Tue, 18 Jul 2023 16:01:30 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web10.11755.1689696083031992929 for ; Tue, 18 Jul 2023 09:01:23 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=xqA4FYIg; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-6682909acadso3928510b3a.3 for ; Tue, 18 Jul 2023 09:01:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696082; x=1692288082; 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=qvUxXEjN0dI1Vm5GJ1BAgUXPRPk9uCc20PnCd8dOYiU=; b=xqA4FYIgBOr3fMEm2/37h5iRHHC1xahYMc1ZakHStf/7+zBGxD54LezeU3NG52d11F YAf7wFFIubWqxQizkf+CXQ1htCspybu0G/EJTMG3LHnRlS+MnoStYv2Oc5677exWiFC/ gUpBVuyko08Ev6ES3DRRPn/fYcgKG51kfjbiYMMIjSadD7DP3cnpfcl3uiWBMJJRyO3G /J5p4h/wpfMrtLLI+cVLdfJERw3yQl/1O2mJ0fiRmg074d7Cr56e9atTYYHWg6WWqTOT 3IoTDhlAbnOYRMDL6heF8plIx8KrRwcjaIeN47pZsfrH4wZ7NcJCAbV+qKgC91H5wQFb 4kuA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696082; x=1692288082; 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=qvUxXEjN0dI1Vm5GJ1BAgUXPRPk9uCc20PnCd8dOYiU=; b=ByMRrbEII7Mn9y0qnhnjZagB6KSEZapzgnrNRdTvYmnNI30xQgk0+vYgO3MCdF18nu mWH4YNR9/xJC2/qqUFKRlXngF3gZ5KlSrHlOw58Y78MVqpk81xdv1jx9Hr2UbCOs89W3 UCUZgxrszJdN5Uvra0bMAt6+8dP2g9x4PwU/Y92346V+csAHGsw5q2c0b1grwFu6Tykk X9ZwThIH8es0tUBsbVVgjWeerzZjUfQf9J1jzVPbaoN/Wh+dNiThIB9LOyAHyfZEmEG1 9HbtDLYVJtPigMqF+ZKUohSdUZoiMBWCxGCsQKDPuJx/QaaR7nWqqbls9Ar3ewc85+Hd hvXg== X-Gm-Message-State: ABy/qLb5DFUgA967iq0LXJlmab+mX+AJOWxGg8a8FS648wwFWr48lfxE 3bDgUxGmME4hwJYxJ496BtFFdSu0Ak4j6wbU18A= X-Google-Smtp-Source: APBJJlGSFFCOyq0hmx+lSBztktJ16Sk5RDs/akunJ56AmTz88sF7b0U4XUs0n2lh2rxc3e8jbHflbg== X-Received: by 2002:a05:6a20:3c8a:b0:134:6aff:ee6c with SMTP id b10-20020a056a203c8a00b001346affee6cmr9407153pzj.41.1689696081797; Tue, 18 Jul 2023 09:01:21 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:20 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 03/13] curl: fix CVE-2023-28320 siglongjmp race condition may lead to crash Date: Tue, 18 Jul 2023 06:00:54 -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 ; Tue, 18 Jul 2023 16:01:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184540 From: Vivek Kumbhar Introduced by: https://github.com/curl/curl/commit/3c49b405de4fbf1fd7127f91908261268640e54f (curl-7_9_8) Fixed by: https://github.com/curl/curl/commit/13718030ad4b3209a7583b4f27f683cd3a6fa5f2 (curl-8_1_0) Follow-up: https://github.com/curl/curl/commit/f446258f0269a62289cca0210157cb8558d0edc3 (curl-8_1_0) https://curl.se/docs/CVE-2023-28320.html Signed-off-by: Vivek Kumbhar Signed-off-by: Steve Sakoman --- .../curl/curl/CVE-2023-28320-fol1.patch | 197 ++++++++++++++++++ .../curl/curl/CVE-2023-28320.patch | 86 ++++++++ meta/recipes-support/curl/curl_7.69.1.bb | 2 + 3 files changed, 285 insertions(+) create mode 100644 meta/recipes-support/curl/curl/CVE-2023-28320-fol1.patch create mode 100644 meta/recipes-support/curl/curl/CVE-2023-28320.patch diff --git a/meta/recipes-support/curl/curl/CVE-2023-28320-fol1.patch b/meta/recipes-support/curl/curl/CVE-2023-28320-fol1.patch new file mode 100644 index 0000000000..eaa6fdc327 --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2023-28320-fol1.patch @@ -0,0 +1,197 @@ +From f446258f0269a62289cca0210157cb8558d0edc3 Mon Sep 17 00:00:00 2001 +From: Daniel Stenberg +Date: Tue, 16 May 2023 23:40:42 +0200 +Subject: [PATCH] hostip: include easy_lock.h before using + GLOBAL_INIT_IS_THREADSAFE + +Since that header file is the only place that define can be defined. + +Reported-by: Marc Deslauriers + +Follow-up to 13718030ad4b3209 + +Closes #11121 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/f446258f0269a62289cca0210157cb8558d0edc3] +CVE: CVE-2023-28320 +Signed-off-by: Vivek Kumbhar +--- + lib/easy_lock.h | 109 ++++++++++++++++++++++++++++++++++++++++++++++++ + lib/hostip.c | 10 ++--- + lib/hostip.h | 9 ---- + 3 files changed, 113 insertions(+), 15 deletions(-) + create mode 100644 lib/easy_lock.h + +diff --git a/lib/easy_lock.h b/lib/easy_lock.h +new file mode 100644 +index 0000000..6399a39 +--- /dev/null ++++ b/lib/easy_lock.h +@@ -0,0 +1,109 @@ ++#ifndef HEADER_CURL_EASY_LOCK_H ++#define HEADER_CURL_EASY_LOCK_H ++/*************************************************************************** ++ * _ _ ____ _ ++ * Project ___| | | | _ \| | ++ * / __| | | | |_) | | ++ * | (__| |_| | _ <| |___ ++ * \___|\___/|_| \_\_____| ++ * ++ * Copyright (C) Daniel Stenberg, , et al. ++ * ++ * This software is licensed as described in the file COPYING, which ++ * you should have received as part of this distribution. The terms ++ * are also available at https://curl.se/docs/copyright.html. ++ * ++ * You may opt to use, copy, modify, merge, publish, distribute and/or sell ++ * copies of the Software, and permit persons to whom the Software is ++ * furnished to do so, under the terms of the COPYING file. ++ * ++ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY ++ * KIND, either express or implied. ++ * ++ * SPDX-License-Identifier: curl ++ * ++ ***************************************************************************/ ++ ++#include "curl_setup.h" ++ ++#define GLOBAL_INIT_IS_THREADSAFE ++ ++#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x600 ++ ++#ifdef __MINGW32__ ++#ifndef __MINGW64_VERSION_MAJOR ++#if (__MINGW32_MAJOR_VERSION < 5) || \ ++ (__MINGW32_MAJOR_VERSION == 5 && __MINGW32_MINOR_VERSION == 0) ++/* mingw >= 5.0.1 defines SRWLOCK, and slightly different from MS define */ ++typedef PVOID SRWLOCK, *PSRWLOCK; ++#endif ++#endif ++#ifndef SRWLOCK_INIT ++#define SRWLOCK_INIT NULL ++#endif ++#endif /* __MINGW32__ */ ++ ++#define curl_simple_lock SRWLOCK ++#define CURL_SIMPLE_LOCK_INIT SRWLOCK_INIT ++ ++#define curl_simple_lock_lock(m) AcquireSRWLockExclusive(m) ++#define curl_simple_lock_unlock(m) ReleaseSRWLockExclusive(m) ++ ++#elif defined(HAVE_ATOMIC) && defined(HAVE_STDATOMIC_H) ++#include ++#if defined(HAVE_SCHED_YIELD) ++#include ++#endif ++ ++#define curl_simple_lock atomic_int ++#define CURL_SIMPLE_LOCK_INIT 0 ++ ++/* a clang-thing */ ++#ifndef __has_builtin ++#define __has_builtin(x) 0 ++#endif ++ ++#ifndef __INTEL_COMPILER ++/* The Intel compiler tries to look like GCC *and* clang *and* lies in its ++ __has_builtin() function, so override it. */ ++ ++/* if GCC on i386/x86_64 or if the built-in is present */ ++#if ( (defined(__GNUC__) && !defined(__clang__)) && \ ++ (defined(__i386__) || defined(__x86_64__))) || \ ++ __has_builtin(__builtin_ia32_pause) ++#define HAVE_BUILTIN_IA32_PAUSE ++#endif ++ ++#endif ++ ++static inline void curl_simple_lock_lock(curl_simple_lock *lock) ++{ ++ for(;;) { ++ if(!atomic_exchange_explicit(lock, true, memory_order_acquire)) ++ break; ++ /* Reduce cache coherency traffic */ ++ while(atomic_load_explicit(lock, memory_order_relaxed)) { ++ /* Reduce load (not mandatory) */ ++#ifdef HAVE_BUILTIN_IA32_PAUSE ++ __builtin_ia32_pause(); ++#elif defined(__aarch64__) ++ __asm__ volatile("yield" ::: "memory"); ++#elif defined(HAVE_SCHED_YIELD) ++ sched_yield(); ++#endif ++ } ++ } ++} ++ ++static inline void curl_simple_lock_unlock(curl_simple_lock *lock) ++{ ++ atomic_store_explicit(lock, false, memory_order_release); ++} ++ ++#else ++ ++#undef GLOBAL_INIT_IS_THREADSAFE ++ ++#endif ++ ++#endif /* HEADER_CURL_EASY_LOCK_H */ +diff --git a/lib/hostip.c b/lib/hostip.c +index 5231a74..d5bf881 100644 +--- a/lib/hostip.c ++++ b/lib/hostip.c +@@ -68,6 +68,8 @@ + #include "curl_memory.h" + #include "memdebug.h" + ++#include "easy_lock.h" ++ + #if defined(CURLRES_SYNCH) && \ + defined(HAVE_ALARM) && \ + defined(SIGALRM) && \ +@@ -77,10 +79,6 @@ + #define USE_ALARM_TIMEOUT + #endif + +-#ifdef USE_ALARM_TIMEOUT +-#include "easy_lock.h" +-#endif +- + #define MAX_HOSTCACHE_LEN (255 + 7) /* max FQDN + colon + port number + zero */ + + /* +@@ -259,8 +257,8 @@ void Curl_hostcache_prune(struct Curl_easy *data) + /* Beware this is a global and unique instance. This is used to store the + return address that we can jump back to from inside a signal handler. This + is not thread-safe stuff. */ +-sigjmp_buf curl_jmpenv; +-curl_simple_lock curl_jmpenv_lock; ++static sigjmp_buf curl_jmpenv; ++static curl_simple_lock curl_jmpenv_lock; + #endif + + /* lookup address, returns entry if found and not stale */ +diff --git a/lib/hostip.h b/lib/hostip.h +index baf1e58..d7f73d9 100644 +--- a/lib/hostip.h ++++ b/lib/hostip.h +@@ -196,15 +196,6 @@ Curl_cache_addr(struct Curl_easy *data, Curl_addrinfo *addr, + #define CURL_INADDR_NONE INADDR_NONE + #endif + +-#ifdef HAVE_SIGSETJMP +-/* Forward-declaration of variable defined in hostip.c. Beware this +- * is a global and unique instance. This is used to store the return +- * address that we can jump back to from inside a signal handler. +- * This is not thread-safe stuff. +- */ +-extern sigjmp_buf curl_jmpenv; +-#endif +- + /* + * Function provided by the resolver backend to set DNS servers to use. + */ +-- +2.25.1 + diff --git a/meta/recipes-support/curl/curl/CVE-2023-28320.patch b/meta/recipes-support/curl/curl/CVE-2023-28320.patch new file mode 100644 index 0000000000..0c9b67440a --- /dev/null +++ b/meta/recipes-support/curl/curl/CVE-2023-28320.patch @@ -0,0 +1,86 @@ +From 13718030ad4b3209a7583b4f27f683cd3a6fa5f2 Mon Sep 17 00:00:00 2001 +From: Harry Sintonen +Date: Tue, 25 Apr 2023 09:22:26 +0200 +Subject: [PATCH] hostip: add locks around use of global buffer for alarm() + +When building with the sync name resolver and timeout ability we now +require thread-safety to be present to enable it. + +Closes #11030 + +Upstream-Status: Backport [https://github.com/curl/curl/commit/13718030ad4b3209a7583b4f27f683cd3a6fa5f2] +CVE: CVE-2023-28320 +Signed-off-by: Vivek Kumbhar +--- + lib/hostip.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +diff --git a/lib/hostip.c b/lib/hostip.c +index f5bb634..5231a74 100644 +--- a/lib/hostip.c ++++ b/lib/hostip.c +@@ -68,12 +68,19 @@ + #include "curl_memory.h" + #include "memdebug.h" + +-#if defined(CURLRES_SYNCH) && \ +- defined(HAVE_ALARM) && defined(SIGALRM) && defined(HAVE_SIGSETJMP) ++#if defined(CURLRES_SYNCH) && \ ++ defined(HAVE_ALARM) && \ ++ defined(SIGALRM) && \ ++ defined(HAVE_SIGSETJMP) && \ ++ defined(GLOBAL_INIT_IS_THREADSAFE) + /* alarm-based timeouts can only be used with all the dependencies satisfied */ + #define USE_ALARM_TIMEOUT + #endif + ++#ifdef USE_ALARM_TIMEOUT ++#include "easy_lock.h" ++#endif ++ + #define MAX_HOSTCACHE_LEN (255 + 7) /* max FQDN + colon + port number + zero */ + + /* +@@ -248,11 +255,12 @@ void Curl_hostcache_prune(struct Curl_easy *data) + Curl_share_unlock(data, CURL_LOCK_DATA_DNS); + } + +-#ifdef HAVE_SIGSETJMP ++#ifdef USE_ALARM_TIMEOUT + /* Beware this is a global and unique instance. This is used to store the + return address that we can jump back to from inside a signal handler. This + is not thread-safe stuff. */ + sigjmp_buf curl_jmpenv; ++curl_simple_lock curl_jmpenv_lock; + #endif + + /* lookup address, returns entry if found and not stale */ +@@ -614,7 +622,6 @@ enum resolve_t Curl_resolv(struct connectdata *conn, + static + RETSIGTYPE alarmfunc(int sig) + { +- /* this is for "-ansi -Wall -pedantic" to stop complaining! (rabe) */ + (void)sig; + siglongjmp(curl_jmpenv, 1); + } +@@ -695,6 +702,8 @@ enum resolve_t Curl_resolv_timeout(struct connectdata *conn, + This should be the last thing we do before calling Curl_resolv(), + as otherwise we'd have to worry about variables that get modified + before we invoke Curl_resolv() (and thus use "volatile"). */ ++ curl_simple_lock_lock(&curl_jmpenv_lock); ++ + if(sigsetjmp(curl_jmpenv, 1)) { + /* this is coming from a siglongjmp() after an alarm signal */ + failf(data, "name lookup timed out"); +@@ -763,6 +772,8 @@ clean_up: + #endif + #endif /* HAVE_SIGACTION */ + ++ curl_simple_lock_unlock(&curl_jmpenv_lock); ++ + /* switch back the alarm() to either zero or to what it was before minus + the time we spent until now! */ + if(prev_alarm) { +-- +2.25.1 + diff --git a/meta/recipes-support/curl/curl_7.69.1.bb b/meta/recipes-support/curl/curl_7.69.1.bb index 13ec117099..ce81df0f05 100644 --- a/meta/recipes-support/curl/curl_7.69.1.bb +++ b/meta/recipes-support/curl/curl_7.69.1.bb @@ -50,6 +50,8 @@ SRC_URI = "https://curl.haxx.se/download/curl-${PV}.tar.bz2 \ file://CVE-2023-27535-pre1.patch \ file://CVE-2023-27535.patch \ file://CVE-2023-27536.patch \ + file://CVE-2023-28320.patch \ + file://CVE-2023-28320-fol1.patch \ " SRC_URI[md5sum] = "ec5fc263f898a3dfef08e805f1ecca42" From patchwork Tue Jul 18 16:00:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27662 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 971EEC001DF for ; Tue, 18 Jul 2023 16:01:30 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web11.11600.1689696085040052675 for ; Tue, 18 Jul 2023 09:01:25 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=0Rzn0iUB; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id d2e1a72fcca58-666e3b15370so4290640b3a.0 for ; Tue, 18 Jul 2023 09:01:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696084; x=1692288084; 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=Cx6SOK3Q5YGR5Fk8ZSU3OF9Bh51P26R0JQ1fg2rEbZk=; b=0Rzn0iUBUbP9qpJi/kAcsDfKi2RbebqEmPwkhUpTZ8NusqUI3Wj5bXAU2lzN8j3nDQ xIsx3XvC85vib2Da5NlD2C/vW3ns/lbcrmkrERx10xGN3R/8No3ZYkMGqYzNCGRcj6kO nTl6F9xh3uVQIlWt4vw6X/2L/KsnMpVo7uPhQu36qJK4i+KPT4O6qb9jZpm+T8NbcPQX URDH/g+INy8L2gbBNqqZ0KFmjMv27hobF1m442xp1pnsjjOUAFs+VIp4AlJi4izFHGQp LdUWBU66pcQmcHapPh+4P/j5Qg60SiK/Xdn4BHHrq53PyY4MieOGwok1qsB0/NotUhkF zqNw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696084; x=1692288084; 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=Cx6SOK3Q5YGR5Fk8ZSU3OF9Bh51P26R0JQ1fg2rEbZk=; b=Dr8aYghpZ3SvvhCrHn8lOML1magtaSBtK5BxiBqvJGn703fBH2lHf+Z37xCYnl6okN O6M60p4l16B1dYLKqR5/0LqghqpkwMqrvDMuzXUK6qPb43fml7iiO/4dvK7ZUfh49x66 YOmNgYpVBD0ELYNQRQDyZKPbsSUAfEPEWwd3hvMfJPdbmHs6dhEpHYcGiTqArOGwlsq7 l9SuLFEKLeyimmUVihncrdOfg5P55ot2Y4gzveK28h93SW9PQlIpAInlUQVGojl14DQe 0UBVZTlk9lKRqxxLA3JBLw9+1ULjcJVGyLD97jTCPX8R1L7LigFEdfU2h8yYnsGPxmnc lmVQ== X-Gm-Message-State: ABy/qLZ9rHGS/yu1pgi0+VK7g4W58bg9wHWXwV2q4l0wGLGe+pT1DseM 2j7ilOhFQeQmRss5jUJ05+cDyRYOy5Aio0Sn1p0= X-Google-Smtp-Source: APBJJlHwX8fE2zD1P5qOqHrHPvFu0s+8xhnpwJpv/5k4Nm938KYZXbtvpT5tQG94ODCu63AaugYMZg== X-Received: by 2002:a05:6a00:1505:b0:67a:6af6:5171 with SMTP id q5-20020a056a00150500b0067a6af65171mr3457970pfu.13.1689696084132; Tue, 18 Jul 2023 09:01:24 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 04/13] python3: fix CVE-2023-24329 urllib.parse url blocklisting bypass Date: Tue, 18 Jul 2023 06:00:55 -1000 Message-Id: <307f23e066e06793ec60f0cddf8ff1c64c02d834.1689690585.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 ; Tue, 18 Jul 2023 16:01:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184541 From: Vivek Kumbhar Signed-off-by: Vivek Kumbhar Signed-off-by: Steve Sakoman --- .../python/python3/CVE-2023-24329.patch | 80 +++++++++++++++++++ .../recipes-devtools/python/python3_3.8.17.bb | 1 + 2 files changed, 81 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/CVE-2023-24329.patch diff --git a/meta/recipes-devtools/python/python3/CVE-2023-24329.patch b/meta/recipes-devtools/python/python3/CVE-2023-24329.patch new file mode 100644 index 0000000000..23dec65602 --- /dev/null +++ b/meta/recipes-devtools/python/python3/CVE-2023-24329.patch @@ -0,0 +1,80 @@ +From 72d356e3584ebfb8e813a8e9f2cd3dccf233c0d9 Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Sun, 13 Nov 2022 11:00:25 -0800 +Subject: [PATCH] gh-99418: Make urllib.parse.urlparse enforce that a scheme + must begin with an alphabetical ASCII character. (GH-99421) + +Prevent urllib.parse.urlparse from accepting schemes that don't begin with an alphabetical ASCII character. + +RFC 3986 defines a scheme like this: `scheme = ALPHA *( ALPHA / DIGIT / "+" / "-" / "." )` +RFC 2234 defines an ALPHA like this: `ALPHA = %x41-5A / %x61-7A` + +The WHATWG URL spec defines a scheme like this: +`"A URL-scheme string must be one ASCII alpha, followed by zero or more of ASCII alphanumeric, U+002B (+), U+002D (-), and U+002E (.)."` +(cherry picked from commit 439b9cfaf43080e91c4ad69f312f21fa098befc7) + +Co-authored-by: Ben Kallus <49924171+kenballus@users.noreply.github.com> + +Upstream-Status: Backport [https://github.com/python/cpython/commit/72d356e3584ebfb8e813a8e9f2cd3dccf233c0d9] +CVE: CVE-2023-24329 +Signed-off-by: Vivek Kumbhar +--- + Lib/test/test_urlparse.py | 18 ++++++++++++++++++ + Lib/urllib/parse.py | 2 +- + ...22-11-12-15-45-51.gh-issue-99418.FxfAXS.rst | 2 ++ + 3 files changed, 21 insertions(+), 1 deletion(-) + create mode 100644 Misc/NEWS.d/next/Library/2022-11-12-15-45-51.gh-issue-99418.FxfAXS.rst + +diff --git a/Lib/test/test_urlparse.py b/Lib/test/test_urlparse.py +index 0ad3bf1..e1aa913 100644 +--- a/Lib/test/test_urlparse.py ++++ b/Lib/test/test_urlparse.py +@@ -735,6 +735,24 @@ class UrlParseTestCase(unittest.TestCase): + with self.assertRaises(ValueError): + p.port + ++ def test_attributes_bad_scheme(self): ++ """Check handling of invalid schemes.""" ++ for bytes in (False, True): ++ for parse in (urllib.parse.urlsplit, urllib.parse.urlparse): ++ for scheme in (".", "+", "-", "0", "http&", "६http"): ++ with self.subTest(bytes=bytes, parse=parse, scheme=scheme): ++ url = scheme + "://www.example.net" ++ if bytes: ++ if url.isascii(): ++ url = url.encode("ascii") ++ else: ++ continue ++ p = parse(url) ++ if bytes: ++ self.assertEqual(p.scheme, b"") ++ else: ++ self.assertEqual(p.scheme, "") ++ + def test_attributes_without_netloc(self): + # This example is straight from RFC 3261. It looks like it + # should allow the username, hostname, and port to be filled +diff --git a/Lib/urllib/parse.py b/Lib/urllib/parse.py +index 979e6d2..2e7a3e2 100644 +--- a/Lib/urllib/parse.py ++++ b/Lib/urllib/parse.py +@@ -452,7 +452,7 @@ def urlsplit(url, scheme='', allow_fragments=True): + clear_cache() + netloc = query = fragment = '' + i = url.find(':') +- if i > 0: ++ if i > 0 and url[0].isascii() and url[0].isalpha(): + if url[:i] == 'http': # optimize the common case + url = url[i+1:] + if url[:2] == '//': +diff --git a/Misc/NEWS.d/next/Library/2022-11-12-15-45-51.gh-issue-99418.FxfAXS.rst b/Misc/NEWS.d/next/Library/2022-11-12-15-45-51.gh-issue-99418.FxfAXS.rst +new file mode 100644 +index 0000000..0a06e7c +--- /dev/null ++++ b/Misc/NEWS.d/next/Library/2022-11-12-15-45-51.gh-issue-99418.FxfAXS.rst +@@ -0,0 +1,2 @@ ++Fix bug in :func:`urllib.parse.urlparse` that causes URL schemes that begin ++with a digit, a plus sign, or a minus sign to be parsed incorrectly. +-- +2.25.1 diff --git a/meta/recipes-devtools/python/python3_3.8.17.bb b/meta/recipes-devtools/python/python3_3.8.17.bb index ba5f564d8e..8c00d65794 100644 --- a/meta/recipes-devtools/python/python3_3.8.17.bb +++ b/meta/recipes-devtools/python/python3_3.8.17.bb @@ -34,6 +34,7 @@ SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://0001-python3-Do-not-hardcode-lib-for-distutils.patch \ file://0020-configure.ac-setup.py-do-not-add-a-curses-include-pa.patch \ file://makerace.patch \ + file://CVE-2023-24329.patch \ " SRC_URI_append_class-native = " \ From patchwork Tue Jul 18 16:00:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27660 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 6CB79C0015E for ; Tue, 18 Jul 2023 16:01:30 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web11.11603.1689696087558712986 for ; Tue, 18 Jul 2023 09:01:27 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=Ly38kCZ6; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-676f16e0bc4so3876880b3a.0 for ; Tue, 18 Jul 2023 09:01:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696086; x=1692288086; 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=3WlHpxdVi93Uvy53gvhv9CgoAYooIq/b5Mj1caXVW/Y=; b=Ly38kCZ6EqfsklU6OJkjf6nCoUwwzQQgG2+5JLq84THsSkauCUId7k9rwR+qwC4rCn +L8IUp7dBe2q/Fx0hF3gyOJyUvVKdFjjqp3LW/1hLrDCo8/YtWz8gA05l+qYBdHarPt5 yvg3wMDae0W0uGJeC2/Q3CCHQ7r33AVQzda1VwoM2zHF3yIKAkAOfXFZN08TEK087SXU Pj/w6Gz1fhBAPnmfxKYmunAYRrhHWnFKEMI05f5CbQ6yyBGzVtH2TykPWMI1bcDbl3ua U92W/ZvSByQvB8UwVIsVy8NNp66cujjdOd+n/1Ttj6mYGcfQ4RTnAUX99eBHqSRXnsX5 nRMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696086; x=1692288086; 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=3WlHpxdVi93Uvy53gvhv9CgoAYooIq/b5Mj1caXVW/Y=; b=UTLH7dOktMvWs+2Pf8jSRbrYquFUGv8Q28vNvnJK29I0GGWmsEYlDCizNv9IJMOWaC W0U1PV3bS84xqPl64vME09hs78NcKNCM+aXG+IK2qx8Gb0bEw1DWZSO4BLqQrDYtOhWt myCPCwdSgXEsrV82hOfzgMSCpzZUI0r9fHejHkBmKiByz4M1vbZZC18UB57bm4rSYjUd g78uvHLHOfGXVzqm/kTiqWsuP18B9eKeLjHWtbnsJEOG4M5LRnJy7bBIVRskrpxuOaBv t1lNKYUSjXiDOwlBr8gaR+7tXLiAg7S1I3PFxfg2TrD+9Km/6A/hX9MxGnyDlc5EPWfg 3mIg== X-Gm-Message-State: ABy/qLYgccxcEP2y/3rj7Dfoo4BRtsI6aHZnBgxpSqD9VjBio6Foal5K KGAwOoVvsOnTRFfHDYdBRzpUqb8yG/EGyytM7gk= X-Google-Smtp-Source: APBJJlECZqhoDWW6Z3Cq3AD8aMl9g+KrHnH6KGmr/AIXaghXVXQ6s0HVKHACs9qBjCMs1qxsfivgSg== X-Received: by 2002:a05:6a00:cd4:b0:668:9bf9:fa70 with SMTP id b20-20020a056a000cd400b006689bf9fa70mr17191179pfv.34.1689696086592; Tue, 18 Jul 2023 09:01:26 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 05/13] qemu: backport Debian patch to fix CVE-2023-0330 Date: Tue, 18 Jul 2023 06:00:56 -1000 Message-Id: <559327579bcee685c6dc22b7ad5595960aa896c0.1689690585.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 ; Tue, 18 Jul 2023 16:01:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184542 From: Vijay Anusuri import patch from ubuntu to fix CVE-2023-0330 Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/qemu/tree/debian/patches?h=ubuntu/focal-security Upstream commit https://gitlab.com/qemu-project/qemu/-/commit/b987718bbb1d0eabf95499b976212dd5f0120d75] Signed-off-by: Vijay Anusuri Signed-off-by: Steve Sakoman --- meta/recipes-devtools/qemu/qemu.inc | 1 + .../qemu/qemu/CVE-2023-0330.patch | 77 +++++++++++++++++++ 2 files changed, 78 insertions(+) create mode 100644 meta/recipes-devtools/qemu/qemu/CVE-2023-0330.patch diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc index 8d6c4050f7..352277573b 100644 --- a/meta/recipes-devtools/qemu/qemu.inc +++ b/meta/recipes-devtools/qemu/qemu.inc @@ -137,6 +137,7 @@ SRC_URI = "https://download.qemu.org/${BPN}-${PV}.tar.xz \ file://CVE-2021-3409-4.patch \ file://CVE-2021-3409-5.patch \ file://hw-display-qxl-Pass-requested-buffer-size-to-qxl_phy.patch \ + file://CVE-2023-0330.patch \ " UPSTREAM_CHECK_REGEX = "qemu-(?P\d+(\.\d+)+)\.tar" diff --git a/meta/recipes-devtools/qemu/qemu/CVE-2023-0330.patch b/meta/recipes-devtools/qemu/qemu/CVE-2023-0330.patch new file mode 100644 index 0000000000..26e22b4c31 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/CVE-2023-0330.patch @@ -0,0 +1,77 @@ +[Ubuntu note: remove fuzz-lsi53c895a-test.c changes since the file does not + exist for this release] +From b987718bbb1d0eabf95499b976212dd5f0120d75 Mon Sep 17 00:00:00 2001 +From: Thomas Huth +Date: Mon, 22 May 2023 11:10:11 +0200 +Subject: [PATCH] hw/scsi/lsi53c895a: Fix reentrancy issues in the LSI + controller (CVE-2023-0330) + +We cannot use the generic reentrancy guard in the LSI code, so +we have to manually prevent endless reentrancy here. The problematic +lsi_execute_script() function has already a way to detect whether +too many instructions have been executed - we just have to slightly +change the logic here that it also takes into account if the function +has been called too often in a reentrant way. + +The code in fuzz-lsi53c895a-test.c has been taken from an earlier +patch by Mauro Matteo Cascella. + +Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1563 +Message-Id: <20230522091011.1082574-1-thuth@redhat.com> +Reviewed-by: Stefan Hajnoczi +Reviewed-by: Alexander Bulekov +Signed-off-by: Thomas Huth + +Reference: https://launchpad.net/ubuntu/+source/qemu/1:4.2-3ubuntu6.27 + +Upstream-Status: Backport [import from ubuntu https://git.launchpad.net/ubuntu/+source/qemu/tree/debian/patches/CVE-2023-0330.patch?h=ubuntu/focal-security +Upstream commit https://gitlab.com/qemu-project/qemu/-/commit/b987718bbb1d0eabf95499b976212dd5f0120d75] +CVE: CVE-2023-0330 +Signed-off-by: Vijay Anusuri +--- + hw/scsi/lsi53c895a.c | 23 +++++++++++++++------ + tests/qtest/fuzz-lsi53c895a-test.c | 33 ++++++++++++++++++++++++++++++ + 2 files changed, 50 insertions(+), 6 deletions(-) + +--- qemu-4.2.orig/hw/scsi/lsi53c895a.c ++++ qemu-4.2/hw/scsi/lsi53c895a.c +@@ -1135,15 +1135,24 @@ static void lsi_execute_script(LSIState + uint32_t addr, addr_high; + int opcode; + int insn_processed = 0; ++ static int reentrancy_level; ++ ++ reentrancy_level++; + + s->istat1 |= LSI_ISTAT1_SRUN; + again: +- if (++insn_processed > LSI_MAX_INSN) { +- /* Some windows drivers make the device spin waiting for a memory +- location to change. If we have been executed a lot of code then +- assume this is the case and force an unexpected device disconnect. +- This is apparently sufficient to beat the drivers into submission. +- */ ++ /* ++ * Some windows drivers make the device spin waiting for a memory location ++ * to change. If we have executed more than LSI_MAX_INSN instructions then ++ * assume this is the case and force an unexpected device disconnect. This ++ * is apparently sufficient to beat the drivers into submission. ++ * ++ * Another issue (CVE-2023-0330) can occur if the script is programmed to ++ * trigger itself again and again. Avoid this problem by stopping after ++ * being called multiple times in a reentrant way (8 is an arbitrary value ++ * which should be enough for all valid use cases). ++ */ ++ if (++insn_processed > LSI_MAX_INSN || reentrancy_level > 8) { + if (!(s->sien0 & LSI_SIST0_UDC)) { + qemu_log_mask(LOG_GUEST_ERROR, + "lsi_scsi: inf. loop with UDC masked"); +@@ -1597,6 +1606,8 @@ again: + } + } + trace_lsi_execute_script_stop(); ++ ++ reentrancy_level--; + } + + static uint8_t lsi_reg_readb(LSIState *s, int offset) From patchwork Tue Jul 18 16:00:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27661 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 750E0C00528 for ; Tue, 18 Jul 2023 16:01:30 +0000 (UTC) Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) by mx.groups.io with SMTP id smtpd.web10.11758.1689696089596263164 for ; Tue, 18 Jul 2023 09:01:29 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=XfgGxQID; spf=softfail (domain: sakoman.com, ip: 209.85.210.182, mailfrom: steve@sakoman.com) Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-666edfc50deso3654148b3a.0 for ; Tue, 18 Jul 2023 09:01:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696088; x=1692288088; 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=6/HBcIpyB6FMUQk9Hi06+wpebDlRXIAt6puUGVKOxj0=; b=XfgGxQIDtjeww+IYFpSfQv0n7rDGvZCcdXAwLHF1ktMR87mG8i5cnL6qwGm+tN8/l0 FZdQpl7NrIF8nFyxzcElVw+j3HzkUYF2RSo3r1C/G3Y3bJbL1deJmrjOn+zuapLNEHz2 ma7JNeeNfwWn944iF5v3SEIbEFpG6bkD9CStHADSOJrcU1eig//vReWYOD/6TzTZH52E 5XmQGizyErFd4Xl8uDCmW8Mxf+jB4CxAoya3m7lrOiBlzahLQdZHkGjKXzsb/Hw9/UKj lKK7td6ckpekXZFo3Q2mwoqB7qXGWzMYDxyjgn7glw4YY1wj+exLdtIjiSmb5ShXbRAQ +GXQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696088; x=1692288088; 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=6/HBcIpyB6FMUQk9Hi06+wpebDlRXIAt6puUGVKOxj0=; b=FCLOhyn9udHUiJ4E6oYV7jU0d55s0NhTdXqrmoBj+GBXUpSxyR2k1Rcyfd23/BWOTZ cknM3k1Z9HamdqZQN1m8RXwA3FtcAZs7HAnTW3gwTqHu4MiGBrwbG92BDUKG1qdlaNem E/zLG8OG+K1cdxL20lwj1VSaxYGPryF8VsICkDrIJER7BrU5plqridKwfsG9ry0a4S9E 8Tw8oh1e5Sl6whL+ZbMqo7FB25KU8864KDkLOlPxxJdSARSmaMMDQrGaCZUOQ1geF4ty 8veDrBYIkMMVmKFzKRnPNVlH2lc0AESTxEzuv7AgnGSF7NJtO0Ln+zIUwta7w7q8WPty LHzw== X-Gm-Message-State: ABy/qLYY5LhqeEXZPdacBL+NnERnU5CUMJqiZ35WlGzaYTe9RB9P5mq3 Y+VCuGVENc0Wf/GoFoBw5i5ES5FTP7DS5IsWcWA= X-Google-Smtp-Source: APBJJlEIxvdTh9UyYXqVescdNJvtt863vLe5KYGJydu1Y81Y25T0wyzhCxCbPbkMIfu3gHcF9UD2Mg== X-Received: by 2002:a05:6a00:368e:b0:64d:42b9:6895 with SMTP id dw14-20020a056a00368e00b0064d42b96895mr15752735pfb.5.1689696088635; Tue, 18 Jul 2023 09:01:28 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 06/13] tzdata: upgrade to 2023c Date: Tue, 18 Jul 2023 06:00:57 -1000 Message-Id: <62c42d4a1029de4fe9b19631cbd34722f6535edf.1689690585.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 ; Tue, 18 Jul 2023 16:01:30 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184543 From: Priyal Doshi Signed-off-by: Priyal Doshi Signed-off-by: Steve Sakoman --- meta/recipes-extended/timezone/timezone.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/recipes-extended/timezone/timezone.inc b/meta/recipes-extended/timezone/timezone.inc index 1834665a1e..2960bfefe3 100644 --- a/meta/recipes-extended/timezone/timezone.inc +++ b/meta/recipes-extended/timezone/timezone.inc @@ -6,7 +6,7 @@ SECTION = "base" LICENSE = "PD & BSD-3-Clause" LIC_FILES_CHKSUM = "file://LICENSE;md5=c679c9d6b02bc2757b3eaf8f53c43fba" -PV = "2022g" +PV = "2023c" SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \ http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata \ @@ -14,5 +14,5 @@ SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz UPSTREAM_CHECK_URI = "http://www.iana.org/time-zones" -SRC_URI[tzcode.sha256sum] = "9610bb0b9656ff404c361a41f3286da53064b5469d84f00c9cb2314c8614da74" -SRC_URI[tzdata.sha256sum] = "4491db8281ae94a84d939e427bdd83dc389f26764d27d9a5c52d782c16764478" +SRC_URI[tzcode.sha256sum] = "46d17f2bb19ad73290f03a203006152e0fa0d7b11e5b71467c4a823811b214e7" +SRC_URI[tzdata.sha256sum] = "3f510b5d1b4ae9bb38e485aa302a776b317fb3637bdb6404c4adf7b6cadd965c" From patchwork Tue Jul 18 16:00:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27666 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 67613EB64DA for ; Tue, 18 Jul 2023 16:01:40 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web11.11606.1689696091919036947 for ; Tue, 18 Jul 2023 09:01:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=WetMykuW; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id d2e1a72fcca58-6687096c6ddso3762712b3a.0 for ; Tue, 18 Jul 2023 09:01:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696091; x=1692288091; 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=8fUvEd2rb7mgnVz1EtRimWn/z8Ziw3BgIPzFfBsTPY8=; b=WetMykuWOLvlP9ck+lq8xC1hfSBz9JNOnYSQ004zgFly7FmJOZ3owNihIFjhZmeWrI Lna0AHxNtQGa7KVnvs41O/lNc0LRtNRU5LaS29BlcuBV5egx+9a7yAALoZN4VSNyoSv1 vwpgXPBQ5dDm2wEJzXR/LUGRYenTGa0JrfI41B3jjx7Vao7D0je9/sSaIlzIm4NkXjwr bXbuUDUyhnHH53aOig6Cb8n2I4826KLMMs34gnFoRVFy4fCE2WCkV0njqpg5kB8dLuQ2 ZMgcMXKwT5cc/64/zOHheQpeo2OUcGR2RFVpqTnKxeDoJHMUnuXfKBVC+bkjmY5gaimg G7ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696091; x=1692288091; 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=8fUvEd2rb7mgnVz1EtRimWn/z8Ziw3BgIPzFfBsTPY8=; b=QCPApGMizSIaVNT+uNCuk2XCX2WC1t2jDPKwbFKd4+8owbetz0IEU3nXU173eCXLVY gQ/OTvUhs7GWgmFDUaH1sui4Z2hOJa3k065VDt+y8AWg0AYpoUdF7ksyoYwdM0kCFRtd 4YYvRqPycrgNlCqF5dUVYgO+ekPmx2qRElNgVi2rwFN7GR7tv6DGfP+PLMrjVDcqhaGE iPFkKpd0/qOUKkHKcVMytDJSuftS08F59qNU/IYUI8sfiSaKg19G8KCSzo81i47eAdcV KU7MyS7UjEuaCbGTu8u4rXr6uncavJcCnxJSCxifLtP0ThEVMxgcHVmqD334DtvY0EKW cbbg== X-Gm-Message-State: ABy/qLbBxtFgO5nKU+7g/XQJ7Vwsx3oTyqteJ6Fy0MxxxxDLCit7zxqQ ZAGJdxK/QsafPEfJLA1L63oi4XmacnahtgbkjfU= X-Google-Smtp-Source: APBJJlEhhWFStesbEM77iqpLZDTEizlMRgJ5h+zr4PNozislXBb4sM9uXcGeejdgKs3nz7xTX+9prg== X-Received: by 2002:a05:6a00:1509:b0:682:4801:93d3 with SMTP id q9-20020a056a00150900b00682480193d3mr16350555pfu.31.1689696090891; Tue, 18 Jul 2023 09:01:30 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:30 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 07/13] glibc: stable 2.31 branch updates. Date: Tue, 18 Jul 2023 06:00:58 -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 ; Tue, 18 Jul 2023 16:01:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184544 From: Deepthi Hemraj Below commits on glibc-2.31 stable branch are updated. 2d4f26e5cf x86: Fix wcsnlen-avx2 page cross length comparison Signed-off-by: Deepthi Hemraj Signed-off-by: Steve Sakoman --- meta/recipes-core/glibc/glibc-version.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/glibc/glibc-version.inc b/meta/recipes-core/glibc/glibc-version.inc index 5414297ba1..95e2bba301 100644 --- a/meta/recipes-core/glibc/glibc-version.inc +++ b/meta/recipes-core/glibc/glibc-version.inc @@ -1,6 +1,6 @@ SRCBRANCH ?= "release/2.31/master" PV = "2.31+git${SRCPV}" -SRCREV_glibc ?= "d4b75594574ab8a9c2c41209cd8c62aac76b5a04" +SRCREV_glibc ?= "2d4f26e5cfda682f9ce61444b81533b83f6381af" SRCREV_localedef ?= "cd9f958c4c94a638fa7b2b4e21627364f1a1a655" GLIBC_GIT_URI ?= "git://sourceware.org/git/glibc.git" From patchwork Tue Jul 18 16:00:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27665 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 69424C0015E for ; Tue, 18 Jul 2023 16:01:40 +0000 (UTC) Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) by mx.groups.io with SMTP id smtpd.web11.11609.1689696093837716321 for ; Tue, 18 Jul 2023 09:01:33 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=b9/emdtZ; spf=softfail (domain: sakoman.com, ip: 209.85.210.171, mailfrom: steve@sakoman.com) Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-6686a05bc66so4281586b3a.1 for ; Tue, 18 Jul 2023 09:01:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696093; x=1692288093; 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=cAwbSrS/nl9Daa/GKGmapjheu+jwiFo9ID6XlBUw21A=; b=b9/emdtZ26ET0J6JT67nSMbF4z0TjtIjTECNXtXtAptVCfNde2jyM66XzlUOnHwTFP eZkwORfU8sSqlQSdZEFds+yb4dKvkNx/Av5MybXiwi9MrRdFqDgUvI6E52csmR0oMJwe aq2e9gPtvP/Kg7NRdoRX38+ZWIjYp48eHqlcJc1CqMzEXv4Rf9Ol0luank5JaPc7wvWP q3J/bRRsZDpDaWXgE4/dfeH9rRrThdzNT3JFnpHziB98D1BIUXHjOddo7sIShTIZ/CBp ogYPgAlbN/jP4ctdCHC/IQh2vQCLrMSXGo8yp+EktU9YgjVXpVWdFUY9hvk6MuDiTKaA 7NhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696093; x=1692288093; 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=cAwbSrS/nl9Daa/GKGmapjheu+jwiFo9ID6XlBUw21A=; b=fHN5pcQHzZiReIIrgQSQ2ieY9SzStelkEmJwttehCjbUS1UioMpo7E2DBFoO9sombp 1A5mkJY/rm4kunNHK03UTbqXW9OLWFThD84wVL5SAffrtzCAMuQlPuamIwasffHdPL4j UCR0dMgczbUWarauR1/wMhoC+DmibpA7/MF5dNYGcD7eqsYFpfkA2jDrjDdmNOt4BqxU UGZIHe/zRBxV8M8hX6GAiYeXL5c5/E+mL1jC+dX/piOuaoOJnA64y7/DZHmFWeFxZAxJ X0Z0yxNYl6wZCUMQjHW2/WcSnwJG7BcPkrZnf0gijIozRArSkWUVmDSZkwx4DwsRqT/T /l9Q== X-Gm-Message-State: ABy/qLbQ8MUfms8gIEiUA+X9OUo/U5TQwwxbUrzzRJ3ysgnsrNKiRnq2 d9BSoz5OZEZ16Q3rEL5nPc/fP3t0peZ9JhQi2Vo= X-Google-Smtp-Source: APBJJlF5X6S6/0h6Vb5tdaQLbOckV8BQW5VtkcADbj0KPGZ98ISzH7e1kV3s6FH5hJoxEolbfwn1Xg== X-Received: by 2002:a05:6a20:4423:b0:122:550f:aad4 with SMTP id ce35-20020a056a20442300b00122550faad4mr3358427pzb.9.1689696092882; Tue, 18 Jul 2023 09:01:32 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 08/13] linux-firmware: upgrade 20230404 -> 20230515 Date: Tue, 18 Jul 2023 06:00:59 -1000 Message-Id: <17988a2cebcccb7ddacb3d085deeab0f0b8f646a.1689690585.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 ; Tue, 18 Jul 2023 16:01:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184545 From: Alexander Kanavin License-Update: additional firmwares Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 64603f602d00999220fe5bafeed996ddcb56d36b) Signed-off-by: Steve Sakoman --- ...{linux-firmware_20230404.bb => linux-firmware_20230515.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20230404.bb => linux-firmware_20230515.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20230515.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20230515.bb index 9ac70b2a3a..a367a9fd01 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20230404.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20230515.bb @@ -134,7 +134,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ " # WHENCE checksum is defined separately to ease overriding it if # class-devupstream is selected. -WHENCE_CHKSUM = "0782deea054d4b1b7f10c92c3a245da4" +WHENCE_CHKSUM = "a0997fc7a9af4e46d96529d6ef13b58a" # These are not common licenses, set NO_GENERIC_LICENSE for them # so that the license files will be copied from fetched source @@ -212,7 +212,7 @@ SRC_URI:class-devupstream = "git://git.kernel.org/pub/scm/linux/kernel/git/firmw # Pin this to the 20220509 release, override this in local.conf SRCREV:class-devupstream ?= "b19cbdca78ab2adfd210c91be15a22568e8b8cae" -SRC_URI[sha256sum] = "c3f9ad2bb5311cce2490f37a8052f836703d6936aabd840246b6576f1f71f607" +SRC_URI[sha256sum] = "8b1acfa16f1ee94732a6acb50d9d6c835cf53af11068bd89ed207bbe04a1e951" inherit allarch From patchwork Tue Jul 18 16:01:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27664 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 6774DEB64DC for ; Tue, 18 Jul 2023 16:01:40 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web10.11761.1689696097061403488 for ; Tue, 18 Jul 2023 09:01:37 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=E2HQP53O; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-668711086f4so3651944b3a.1 for ; Tue, 18 Jul 2023 09:01:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696096; x=1692288096; 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=7L6FV1gPM5BLMs8w6jmuusy1CUGUqXzoL8OB09Tq6LM=; b=E2HQP53O9U0jQcZamu1CWSVqiLMLxJSaUeGnKsqsbQPRSXGEFlNY0PVuXe5rcN6636 bRQARteW4wjVjDjrMwfGJ4+yk29NMKwcecYBG+0U6nNjpUx6jzO2OeLx3jPGMwEMOrz5 fs4E0mPjur2xbRz2bBmK7ufLBB6tDUoPPAuIR7XrgK51uZfnxU+ZX/E0PUTX4rcPhKsO pnA/6zWBY1YDCmeQJFcqXqsryVj7Ef86gD0280qcpOY9LCbYZ5DWSVA8QW4cqfu2DTLc 87bMPgJiw7zEC/e2t4CaBJil9gQ8Nid3wT51Mk65V+6v37yqPszVNuUDNwFr/AK3q0xg h4vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696096; x=1692288096; 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=7L6FV1gPM5BLMs8w6jmuusy1CUGUqXzoL8OB09Tq6LM=; b=JVoDRfkW/7fiM3vTehh/q6cH1lu6vYaBUTWjtiCi4o/MOcVoGGem3HSCa4f9QEG8VQ vBLJAcKiW0azg95xRTq3bW5wKp/sFlG4fXydb462zZbpeOiWCtwlJtWcsVBxjBG/PxyM CBTputH3G+GVWiy+g2mea4XV29SUYNukN/PW2Fyl3KgesvhMAWgRudglESj9d4tZUIwd TtxsCDUcykWorG9a6RcuN9oTLcYXgjvhlrY/fkqoUda9+HKCqqyzpUqFnmyCDwsGwleV hZbD96jFdQEQ7cIzUfmxX41wZ5lsdBI64NSOpdY8qd0wOMLapdUxWSf1UhbPDnS42/fD 5+JA== X-Gm-Message-State: ABy/qLYFYYv8O8e1vhdQpMjyWeWJxCc5exwHEIh71u+L1S9leQ6ib4IT RGtYClpAgyJMAjiJFAG0KAVWpHia8Rb1BQAEURE= X-Google-Smtp-Source: APBJJlGk7RGKsiQ8krcrVGw0jUdPKyhdSR2I945WygKBTl46mor9i22bIsjbGp2sZi0G3JelxU/iXw== X-Received: by 2002:a05:6a00:2e1d:b0:668:7494:384a with SMTP id fc29-20020a056a002e1d00b006687494384amr17082947pfb.12.1689696096100; Tue, 18 Jul 2023 09:01:36 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:35 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 09/13] wireless-regdb: upgrade 2023.02.13 -> 2023.05.03 Date: Tue, 18 Jul 2023 06:01:00 -1000 Message-Id: <67adfd6cbcdbb765460e6f97d8957c872d8f5c81.1689690585.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 ; Tue, 18 Jul 2023 16:01:40 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184546 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 47438402fa430499864a4b1f1a13eaac66aa21c0) Signed-off-by: Steve Sakoman --- ...ireless-regdb_2023.02.13.bb => wireless-regdb_2023.05.03.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-kernel/wireless-regdb/{wireless-regdb_2023.02.13.bb => wireless-regdb_2023.05.03.bb} (94%) diff --git a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb similarity index 94% rename from meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb rename to meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb index 295510225a..f3c3cd78e9 100644 --- a/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.02.13.bb +++ b/meta/recipes-kernel/wireless-regdb/wireless-regdb_2023.05.03.bb @@ -5,7 +5,7 @@ LICENSE = "ISC" LIC_FILES_CHKSUM = "file://LICENSE;md5=07c4f6dea3845b02a18dc00c8c87699c" SRC_URI = "https://www.kernel.org/pub/software/network/${BPN}/${BP}.tar.xz" -SRC_URI[sha256sum] = "fe81e8a8694dc4753a45087a1c4c7e1b48dee5a59f5f796ce374ea550f0b2e73" +SRC_URI[sha256sum] = "f254d08ab3765aeae2b856222e11a95d44aef519a6663877c71ef68fae4c8c12" inherit bin_package allarch From patchwork Tue Jul 18 16:01:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27667 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 6998FC0015E for ; Tue, 18 Jul 2023 16:01:50 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web11.11615.1689696101257105234 for ; Tue, 18 Jul 2023 09:01:41 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=pCfASCsd; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-666e64e97e2so3932823b3a.1 for ; Tue, 18 Jul 2023 09:01:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696100; x=1692288100; 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=+LQzCaIQynDv84hXY+joQxSu2Ho4iGVNtQitnefFS6M=; b=pCfASCsdp3mCyxkDnGNE3334k2/NYuyKCMIsRUC7LKpp2cc/tU/0ldrcnKCAB0PH33 LMiNXfECprN2h+6Za//bWt0MJQjuEVp1/YdY47HqEmdaYalVfL47hRiJzHgIpmjP/DIj oyIrMOAxtJUcS7EiG450oAbAZHdkOrCiIGPuTCZ3LRJU/wtagdcGnr8VCXgnXrrKbjTX INrx86c4pkn5UMJA0NPwJvEmMV72J9Z+h4c/3QTp+GF19IvG7d02/+A/qlNdDrXwj9Wt WPsnO4yH5BuUWF3VeUxpQIJSIqoUe0UnLepkjRxJYhgLWcPA7W7U7oRg+NsS7LtokMj6 /MdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696100; x=1692288100; 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=+LQzCaIQynDv84hXY+joQxSu2Ho4iGVNtQitnefFS6M=; b=b/3rQ910W/EEp+THHVZ0OVfwViZmPGVBig2yVWcwPmHDqNydiMb5FtXQrNA2ZcxDMA s622z2rQW10XSsBZ2uMtdfJhxMeoRL8DycvOiNydGAGJTtTtwUeXbAF8YIrBLguCQmmj MhxMGRPbLJhKvoXAYmqjIpHyXF1AFvKYY16sPY0RrU2L6Bb/g6eXe7p0cH+++sErFC1R 7J25vf3OMCKLdjAKjaJgOi8h7k50KKKmHIPlwoNOXD+eCGCNdEcNAigZbcdFlOJOYrsZ vPvfw/7SNREeZRHUNaV2FOFM2zHKGbLPrqBe5GEU+iBOQ5ClUYfirzecstihhjsgZ8T+ 63tQ== X-Gm-Message-State: ABy/qLZMmMf8SeQPWuF0N8n+pC+NfeCEnd1/Lj1K1kJNZN+UFnscecYa sB48z4t3/ya89t3U3Y83Dx1sHWMjwWq2zbMSF6E= X-Google-Smtp-Source: APBJJlFBfRQ5jVtwn5tN8k6pZTghN1ssAwdyfRO0zHdIXbvPf318gc2ahwsJpRsN21PHsZK/IhdVeg== X-Received: by 2002:a05:6a21:32a7:b0:135:110c:c6e1 with SMTP id yt39-20020a056a2132a700b00135110cc6e1mr4498380pzb.7.1689696099825; Tue, 18 Jul 2023 09:01:39 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:39 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 10/13] vim: upgrade 9.0.1527 -> 9.0.1592 Date: Tue, 18 Jul 2023 06:01:01 -1000 Message-Id: <8a481b1dfeeee8d8d3430f527da1f3f5b7d96999.1689690585.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 ; Tue, 18 Jul 2023 16:01:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184547 From: Trevor Gamblin Fixes: https://nvd.nist.gov/vuln/detail/CVE-2023-2609 d1ae836 patch 9.0.1531: crash when register contents ends up being invalid https://nvd.nist.gov/vuln/detail/CVE-2023-2610 ab9a2d8 patch 9.0.1532: crash when expanding "~" in substitute causes very long text Signed-off-by: Trevor Gamblin Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 1e4b4dfb4145bc00eb6937b5f54a41170e9a5b4c) 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 800ee40f92..bbafa170f4 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 .= ".1527" -SRCREV = "c28e7a2b2f23dbd246a1ad7ad7aaa6f7ab2e5887" +PV .= ".1592" +SRCREV = "29b4c513b11deb37f0e0538df53d195f602fa42c" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Tue Jul 18 16:01:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 27668 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 62E62EB64DC for ; Tue, 18 Jul 2023 16:01:50 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web10.11767.1689696104159667453 for ; Tue, 18 Jul 2023 09:01:44 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=z5MnsFQW; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-6686a05bc66so4281718b3a.1 for ; Tue, 18 Jul 2023 09:01:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696103; x=1692288103; 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=pi6zLeMRpuCY7R68sBGRdbCrUhRVagmQuyb5m2mHJmM=; b=z5MnsFQWbzZ+VvXI/xanb8teH1112ZZPzHiAFiVo6a5yzWFe09QKMaladK0MLy2Ufy L18584NWvXpaalfl6anNxD1dGXx45flWvQVKTKb0pBUVFfKQXJdTOH/ZSG2RHl7n/PMb UxQEmrKXDCuAIsa2qfTXIW2Hag9z/l/EaYdrrOAr8RHnE46UP3/KWq+4vC+US6gbmUbR I+DUlYvbTaA02KyrlENDRlXKTYhX2azcjFojYIxFZBskMkj5j/nQVSHupN1RvutzhCc3 LRI9HthqulUv6ErpCKJzVE0UKgfOpMFanr35j7P7BhmkhG2kButoLpQX3cstPHu1IKm6 Lk/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696103; x=1692288103; 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=pi6zLeMRpuCY7R68sBGRdbCrUhRVagmQuyb5m2mHJmM=; b=LGvdYc5TqjL1Au2ZkxU+v3YzLVptKEsw7Xu093VRGsWf75BTyNkZ9GIt/Kol7cMaiS 90I5CiYiROyfHIgeqfaMtaIbk6ioQbWbwC6v3nG1xRj0rctQhl8hSfJZVVQQukuuqc83 eiFIeFMPi/VqjlFboHTqROVOy/E6SEvG9GowuFn6WJH4eO4Nw3LUFnXglL9dJCIPHXb+ MHbXqdBgJMHtICuWF14AUsnRIIfuJPr1Wwxaqs/2K6s2dIKUHrcyrLLquBIZ0IhH58Or /hnExnl8xIN5MBKFAKshwNGT34ghpICyNQny3X/pD+pFN8Rtn/QSzVii58N/5gngC4gF qhNQ== X-Gm-Message-State: ABy/qLaI8wYfheif+GwsuDq/r5DMjWnZ8qOgO35SExS7/GjTxGHPAmzW i8ZDWLJQ4MPDrLOGVy5L1nuIEAMDWj7Xx90JHgg= X-Google-Smtp-Source: APBJJlGrA0SRHJWKm/bs+npCbhOOKwlac0wdi24l1Ury3rA1O3aPLhm18N3SMvhWJeA5VjKNyY0rTg== X-Received: by 2002:a05:6a00:1949:b0:682:d2af:218 with SMTP id s9-20020a056a00194900b00682d2af0218mr2733690pfk.24.1689696103168; Tue, 18 Jul 2023 09:01:43 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:42 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 11/13] kernel-fitimage: fix dtbo support for fit images Date: Tue, 18 Jul 2023 06:01:02 -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 ; Tue, 18 Jul 2023 16:01:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184548 From: Anthony Bagwell 8a2f4e143 added support for u-boot boot script but missed adding the extra parameter to fitimage_emit_section_config on the dtbo branch Signed-off-by: Richard Purdie (cherry picked from commit 22bac8aea0d5d28cc5a3bf20edf638225cce2f88) Signed-off-by: Steve Sakoman --- meta/classes/kernel-fitimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass index b88d7dbe4b..7c7bcd3fc0 100644 --- a/meta/classes/kernel-fitimage.bbclass +++ b/meta/classes/kernel-fitimage.bbclass @@ -519,7 +519,7 @@ fitimage_assemble() { for DTB in ${DTBS}; do dtb_ext=${DTB##*.} if [ "${dtb_ext}" = "dtbo" ]; then - fitimage_emit_section_config ${1} "" "${DTB}" "" "" "`expr ${i} = ${dtbcount}`" + fitimage_emit_section_config ${1} "" "${DTB}" "" "${bootscr_id}" "" "`expr ${i} = ${dtbcount}`" else fitimage_emit_section_config ${1} "${kernelcount}" "${DTB}" "${ramdiskcount}" "${bootscr_id}" "${setupcount}" "`expr ${i} = ${dtbcount}`" fi From patchwork Tue Jul 18 16:01: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: 27669 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 68764C001DF for ; Tue, 18 Jul 2023 16:01:50 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web10.11769.1689696107188429345 for ; Tue, 18 Jul 2023 09:01:47 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=BjtjEITi; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id d2e1a72fcca58-676f16e0bc4so3877248b3a.0 for ; Tue, 18 Jul 2023 09:01:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696106; x=1692288106; 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=ZwWSBjiI5zABpALWWRK+2muegwqmZ05IymCwjv7wyMg=; b=BjtjEITiZ0cwMPlWPKG/ZFaq6XD1fiS1bc0YNjC6b8LP1xm8GT7F3GqYt2lrLZURAF RkJqgZhFwcB42DWkMSqSX3nQ/ANE3Y7FmDbJ+44O3+kjBRSBACXRtA8JvVEIpusTx68p wakErssp7LOFMKItOto5gdECHxPNvzxCFNvAj8bUM1fhzxAPU1TS58qAk91/S8fle4+8 hIF4V2xhWloto1wtE9LFAeVc9n4k1UBjBMvW52JC8ZJkbf8rT58ifiiMyFYONOxsIVA+ +H9NWm5SqkMkjq+WrFvj+yb6LnucA/81Dzt7HovOjGJADzbJHb5UZVXXQ7DGvFbli7sO Bbkw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696106; x=1692288106; 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=ZwWSBjiI5zABpALWWRK+2muegwqmZ05IymCwjv7wyMg=; b=hm6r3IWl/XxXL5DhxuKfAZ170/YasgFy9tXU5D2JHgH8Ojz4hw1lI2Mzn8KRUXwsU/ 4/4WiYldyOBDV/qMd07+df6ZCihhoi441k6V9dS7WssYuMVGRN+VN6vIh2ZmlKrY17+B MZZw1AJzD4U0/o92kaYjkhygPNS0BJ+4T8Tw+kSjL27+0E3pce6PayGSYY91ZgFzRRQ3 78SSkPvY05bbz7zWAnYMx7ahn34FZnphSRo4TxvaBBJOKerqXGdC1mO85o/tecN+SWST QecMZtFefXAGiHVdHWa4Wx+hSJD/3pbtUaXf0RhJ288DeGWRq6oYJLuD6gDl3NEB2FeN bDNw== X-Gm-Message-State: ABy/qLaG4TC+tE6fp0nQw1hXjOkmtTs+Ei+4bc1UzJi7tOuM+/wFpHoW LIY051Auafg8yU7q6EYHx8lhxT1tHrUmmzZmxK0= X-Google-Smtp-Source: APBJJlGB8RYVbkR02rjxA1j6TFhKjjjpWagbGWE9/iwQperf1Muw02vABJb5ZBNqllyUI87eB2I3Dg== X-Received: by 2002:a05:6a00:17a1:b0:682:4ef7:9b17 with SMTP id s33-20020a056a0017a100b006824ef79b17mr19782112pfg.32.1689696106217; Tue, 18 Jul 2023 09:01:46 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:45 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 12/13] libpng: Add ptest for libpng Date: Tue, 18 Jul 2023 06:01:03 -1000 Message-Id: <843803bcc248b18cdefb29d610a1371e32e815ce.1689690585.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 ; Tue, 18 Jul 2023 16:01:50 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184549 From: Nikhil R libpng is a platform-independent library which supports all PNG features. This ptest executes the below binaries, parses the png image and prints the image features. 1. pngfix - provides information about PNG image copyrights details. 2. pngtest - tests, optimizes and optionally fixes the zlib header in PNG files. 3. pngstest - verifies the integrity of PNG image by dumping chunk level information. 4. timepng - provides details about PNG image chunks. Signed-off-by: Nikhil R Signed-off-by: Steve Sakoman --- .../distro/include/ptest-packagelists.inc | 1 + .../recipes-multimedia/libpng/files/run-ptest | 29 +++++++++++++++++++ .../libpng/libpng_1.6.37.bb | 15 ++++++++-- 3 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-multimedia/libpng/files/run-ptest diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index badfd69325..3fb7ec2657 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -26,6 +26,7 @@ PTESTS_FAST = "\ liberror-perl-ptest \ libmodule-build-perl-ptest \ libpcre-ptest \ + libpng-ptest \ libtimedate-perl-ptest \ libtest-needs-perl-ptest \ liburi-perl-ptest \ diff --git a/meta/recipes-multimedia/libpng/files/run-ptest b/meta/recipes-multimedia/libpng/files/run-ptest new file mode 100644 index 0000000000..9ab5d0c1f4 --- /dev/null +++ b/meta/recipes-multimedia/libpng/files/run-ptest @@ -0,0 +1,29 @@ +#!/bin/sh + +set -eux + +./pngfix pngtest.png &> log.txt 2>&1 + +if grep -i "OK" log.txt 2>&1 ; then + echo "PASS: pngfix passed" +else + echo "FAIL: pngfix failed" +fi +rm -f log.txt + +./pngtest pngtest.png &> log.txt 2>&1 + +if grep -i "PASS" log.txt 2>&1 ; then + echo "PASS: pngtest passed" +else + echo "FAIL: pngtest failed" +fi +rm -f log.txt + +for i in pngstest timepng; do + if "./${i}" pngtest.png 2>&1; then + echo "PASS: $i" + else + echo "FAIL: $i" + fi +done diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.37.bb b/meta/recipes-multimedia/libpng/libpng_1.6.37.bb index 3c46fa3302..9387fc8e2e 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.6.37.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.37.bb @@ -10,7 +10,10 @@ DEPENDS = "zlib" LIBV = "16" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz" +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}${LIBV}/${BP}.tar.xz \ + file://run-ptest \ + " SRC_URI[md5sum] = "015e8e15db1eecde5f2eb9eb5b6e59e9" SRC_URI[sha256sum] = "505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca" @@ -20,7 +23,7 @@ UPSTREAM_CHECK_URI = "http://libpng.org/pub/png/libpng.html" BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config" -inherit autotools binconfig-disabled pkgconfig +inherit autotools binconfig-disabled pkgconfig ptest # Work around missing symbols EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}" @@ -33,3 +36,11 @@ BBCLASSEXTEND = "native nativesdk" # CVE-2019-17371 is actually a memory leak in gif2png 2.x CVE_CHECK_WHITELIST += "CVE-2019-17371" + +do_install_ptest() { + install -m644 "${S}/pngtest.png" "${D}${PTEST_PATH}" + install -m755 "${B}/.libs/pngfix" "${D}${PTEST_PATH}" + install -m755 "${B}/.libs/pngtest" "${D}${PTEST_PATH}" + install -m755 "${B}/.libs/pngstest" "${D}${PTEST_PATH}" + install -m755 "${B}/.libs/timepng" "${D}${PTEST_PATH}" +} From patchwork Tue Jul 18 16:01: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: 27670 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 68BEBEB64DC for ; Tue, 18 Jul 2023 16:02:00 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web11.11622.1689696112283895298 for ; Tue, 18 Jul 2023 09:01:52 -0700 Authentication-Results: mx.groups.io; dkim=fail reason="signature has expired" header.i=@sakoman-com.20221208.gappssmtp.com header.s=20221208 header.b=a/dbNM2E; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-666e5f0d60bso3741815b3a.3 for ; Tue, 18 Jul 2023 09:01:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20221208.gappssmtp.com; s=20221208; t=1689696111; x=1692288111; 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=314ImVU9k+jrR92nnteJoOdUaBMMvKDv/K4P+Aepsn4=; b=a/dbNM2E9EEo5zqiZwdWyg91xQL6OBH2Je0PxS1am9O9rB0Z0JQB4bFlxdkzAkoYze I9CtESjfmZ5Pg5oJki4nz+UTQRLD4wgZHycfzLATisyZwHBnMtAPTpJSXv+jwGcpqnT5 JnGXWfommCo4S7FcmhphrUE4LCwYPjiXHONMgCngIp/bA7oL2A07Xn+mev/4LDPtK/mZ yTM8YLysBISoV9whQ0r2b6ZY7Vq2ZgEKGdEFKHb4G/Lkd/PIewDJfuEd8FdOjNQ+tODN 9hmyMRu3d76vt714p6ZAlF+k9E8J0Wy09liJmYRCqzZhjDzGsDBrTa32euPvWFkCq+Wy +k6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689696111; x=1692288111; 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=314ImVU9k+jrR92nnteJoOdUaBMMvKDv/K4P+Aepsn4=; b=PWJWIYQ3ie0x+jNlirjHh5GAL0kJa/bieduYnpDm2jQNDZjKmGkKqNDFFxhDIVNPKf k4DytHAHESAaxy4icieycPm11Pfj9Zrf99BFig3WQjXYiX83JyTlKQVQNif7kq78+bTN GkY4GG9EKv6ofB2Bbj75/8mXLYUZdrWluV3BCuIXRJSB1f9dMtqT3PgHDFJKdlifGW92 H05scwzyUFk4hnQ6aDJIztr2y68Bt4DGZ6OlGsRnT2ry3CTrnKuw/jYhPAuazFFXS9xR oZtB8jiQU0Ob0OvqzeOyA+gGXQtuWQb2BX2Yf/FEnX85+N9N6wMYPZ6qDxViFOyIJHrc SiUw== X-Gm-Message-State: ABy/qLZvjqp8duwkmX5vqwiXB5jKF0cDPkh8nw56OZIKmu7wGzYkElNZ nn0t5Dlp3stdElgSQNYzKkaqPUs7fHOSJwj41sc= X-Google-Smtp-Source: APBJJlEbK4nld5LektVk6V/kCFuCTplkIGo4dMO6vmc4e4TiLCKlxJW1KGHmGferNHAvvWmayxBEQQ== X-Received: by 2002:a05:6a00:1914:b0:66a:365c:a0e6 with SMTP id y20-20020a056a00191400b0066a365ca0e6mr15964387pfi.13.1689696111362; Tue, 18 Jul 2023 09:01:51 -0700 (PDT) Received: from hexa.lan (dhcp-72-234-106-30.hawaiiantel.net. [72.234.106.30]) by smtp.gmail.com with ESMTPSA id q17-20020a62e111000000b0064928cb5f03sm1710089pfh.69.2023.07.18.09.01.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Jul 2023 09:01:50 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 13/13] cmake: Fix CMAKE_SYSTEM_PROCESSOR setting for SDK Date: Tue, 18 Jul 2023 06:01:04 -1000 Message-Id: <7a7ef9d73affc23fa14712d56f1a40d0c46569cb.1689690585.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 ; Tue, 18 Jul 2023 16:02:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/184550 From: Tom Hochstein When building using an SDK, cmake complains that the target architecture 'cortexa53-crypto' is unknown. The same build in bitbake uses the target architecture 'aarch64'. Set CMAKE_SYSTEM_PROCESSOR the same as for bitbake. Signed-off-by: Tom Hochstein Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit d32a6225eefce2073a1cd401034b5b4c68351bfe) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake index f8af79ddd5..a7020da9c7 100644 --- a/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake +++ b/meta/recipes-devtools/cmake/cmake/OEToolchainConfig.cmake @@ -12,10 +12,7 @@ set( CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY ) set(CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX "$ENV{OE_CMAKE_FIND_LIBRARY_CUSTOM_LIB_SUFFIX}") -# Set CMAKE_SYSTEM_PROCESSOR from the sysroot name (assuming processor-distro-os). -if ($ENV{SDKTARGETSYSROOT} MATCHES "/sysroots/([a-zA-Z0-9_-]+)-.+-.+") - set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_MATCH_1}) -endif() +set( CMAKE_SYSTEM_PROCESSOR $ENV{OECORE_TARGET_ARCH} ) # Include the toolchain configuration subscripts file( GLOB toolchain_config_files "${CMAKE_TOOLCHAIN_FILE}.d/*.cmake" )