From patchwork Wed Jan 5 15:18:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2063 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 02CDEC433EF for ; Wed, 5 Jan 2022 15:19:04 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:02 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=d+eN5GgU; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395942; x=1672931942; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=2fQAnPoD6hZIjsVlbrbmCXluX3rlu1U29BZwBWI2KJU=; b=d+eN5GgUo/gi5u4Qw+IjhGtvCzYTgSN5MZCvIvvoBF18gTtEUyaOva1A pvappeW3U5CE541Tcg+l0ut1Go7reGcvSnSVZ1n7nc+zz2K9LpzfLsy7M BIZg8AbHwApOayieWtjUyrB5GepmRHI9oNH707S24BR9AOeWFiwFmC9cV NTF1fvZL8ldfFPJXxMaeAQeTrlSARfJLaGvc2yGJnL/NCDz7TDPDlliY1 4+XQ+xnZ3DfwURDlvFFtbo7PxQrTi7Ki11A/XDf7WPH/4tOmRddHyBITL IlS5ekeyYqorv0rgg6R1shF/upwC4s4gPvbYfbjoBFFOiD1XRQzJg/Tsv Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742720" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742720" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:00 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128551" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:18:58 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 01/24] busybox: upgrade 1.33.1 -> 1.33.2 Date: Wed, 5 Jan 2022 23:18:21 +0800 Message-Id: <0b34671cb9a91419216a532954bd2783d3384ba0.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:04 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160186 Bug fix release. 1.33.2 has fixes for hush and ash (parsing fixes) and unlzma (fix a case where we could read before beginning of buffer). Signed-off-by: Anuj Mittal --- .../{busybox-inittab_1.33.0.bb => busybox-inittab_1.33.2.bb} | 0 .../busybox/{busybox_1.33.1.bb => busybox_1.33.2.bb} | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-core/busybox/{busybox-inittab_1.33.0.bb => busybox-inittab_1.33.2.bb} (100%) rename meta/recipes-core/busybox/{busybox_1.33.1.bb => busybox_1.33.2.bb} (95%) diff --git a/meta/recipes-core/busybox/busybox-inittab_1.33.0.bb b/meta/recipes-core/busybox/busybox-inittab_1.33.2.bb similarity index 100% rename from meta/recipes-core/busybox/busybox-inittab_1.33.0.bb rename to meta/recipes-core/busybox/busybox-inittab_1.33.2.bb diff --git a/meta/recipes-core/busybox/busybox_1.33.1.bb b/meta/recipes-core/busybox/busybox_1.33.2.bb similarity index 95% rename from meta/recipes-core/busybox/busybox_1.33.1.bb rename to meta/recipes-core/busybox/busybox_1.33.2.bb index 4002d6a5c6..44c83ab83c 100644 --- a/meta/recipes-core/busybox/busybox_1.33.1.bb +++ b/meta/recipes-core/busybox/busybox_1.33.2.bb @@ -51,4 +51,4 @@ SRC_URI = "https://busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ " SRC_URI_append_libc-musl = " file://musl.cfg " -SRC_URI[tarball.sha256sum] = "12cec6bd2b16d8a9446dd16130f2b92982f1819f6e1c5f5887b6db03f5660d28" +SRC_URI[tarball.sha256sum] = "6843ba7977081e735fa0fdb05893e3c002c8c5ad7c9c80da206e603cc0ac47e7" From patchwork Wed Jan 5 15:18:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2065 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 09334C4332F for ; Wed, 5 Jan 2022 15:19:05 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:03 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=KSHddyb1; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395943; x=1672931943; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=9uIetNW0h7wcTf7ANAP0V/b6imscPZx0+97G5dGPo4o=; b=KSHddyb17MpYz2mko2EAPchfGvESA3qLvH6+kcRCv8u9N11GazUwCGiM Tio0TrJ6FGbd8rvGBjux4ScsWn8muuFcvz98Id3Pyg622tOjuQJjRB3pP WT+mFMJTSjLZUHJEWqI6pk6vm0m4/cnIZxydtIi268acwoipgy3fO9gSs Vhrfn2HzfIBELwgwP6FMPTZtqdqqsk0gpg0cpzyiOqmXnT8MwqOOmy88g 4GCDDLXWialyZ1SeYSOPVdinyBsFNqdseSwkvj29EDSuiU4qzoxkaiv/X QphAXCovPCscGjE2HYCQCb+fZUhbIbLWtMQmL8zKssWkVogeuwU2jHxI1 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742738" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742738" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:02 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128559" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:00 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 02/24] binutils: CVE-2021-42574 Date: Wed, 5 Jan 2022 23:18:22 +0800 Message-Id: <944a60cd74ea90dcced7684492a808fbfd6710af.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160187 From: pgowda Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=b3aa80b45c4f46029efeb204bb9f2d2c4278a0e5] Signed-off-by: pgowda Signed-off-by: Anuj Mittal --- .../binutils/binutils-2.36.inc | 1 + .../binutils/0001-CVE-2021-42574.patch | 2006 +++++++++++++++++ 2 files changed, 2007 insertions(+) create mode 100644 meta/recipes-devtools/binutils/binutils/0001-CVE-2021-42574.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.36.inc b/meta/recipes-devtools/binutils/binutils-2.36.inc index 7d0824e060..e4fdadc70a 100644 --- a/meta/recipes-devtools/binutils/binutils-2.36.inc +++ b/meta/recipes-devtools/binutils/binutils-2.36.inc @@ -46,5 +46,6 @@ SRC_URI = "\ file://0003-CVE-2021-20197.patch \ file://0017-CVE-2021-3530.patch \ file://0018-CVE-2021-3530.patch \ + file://0001-CVE-2021-42574.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils/0001-CVE-2021-42574.patch b/meta/recipes-devtools/binutils/binutils/0001-CVE-2021-42574.patch new file mode 100644 index 0000000000..c93fd770b3 --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0001-CVE-2021-42574.patch @@ -0,0 +1,2006 @@ +From b3aa80b45c4f46029efeb204bb9f2d2c4278a0e5 Mon Sep 17 00:00:00 2001 +From: Nick Clifton +Date: Tue, 9 Nov 2021 13:25:42 +0000 +Subject: [PATCH] Add --unicode option to control how unicode characters are + handled by display tools. + + * nm.c: Add --unicode option to control how unicode characters are + handled. + * objdump.c: Likewise. + * readelf.c: Likewise. + * strings.c: Likewise. + * binutils.texi: Document the new feature. + * NEWS: Document the new feature. + * testsuite/binutils-all/unicode.exp: New file. + * testsuite/binutils-all/nm.hex.unicode + * testsuite/binutils-all/strings.escape.unicode + * testsuite/binutils-all/objdump.highlight.unicode + * testsuite/binutils-all/readelf.invalid.unicode + +CVE: CVE-2021-42574 +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=b3aa80b45c4f46029efeb204bb9f2d2c4278a0e5] + +Signed-off-by: pgowda +--- + binutils/ChangeLog | 15 + + binutils/NEWS | 9 + + binutils/doc/binutils.texi | 78 ++++ + binutils/nm.c | 228 ++++++++++- + binutils/objdump.c | 235 ++++++++++-- + binutils/readelf.c | 190 +++++++++- + binutils/strings.c | 757 ++++++++++++++++++++++++++++++++++--- + 7 files changed, 1409 insertions(+), 103 deletions(-) + +diff --git a/binutils/ChangeLog b/binutils/ChangeLog +--- a/binutils/ChangeLog 2021-12-23 03:23:38.425843662 -0800 ++++ b/binutils/ChangeLog 2021-12-23 03:30:31.094968942 -0800 +@@ -1,3 +1,18 @@ ++2021-11-09 Nick Clifton ++ ++ * nm.c: Add --unicode option to control how unicode characters are ++ handled. ++ * objdump.c: Likewise. ++ * readelf.c: Likewise. ++ * strings.c: Likewise. ++ * binutils.texi: Document the new feature. ++ * NEWS: Document the new feature. ++ * testsuite/binutils-all/unicode.exp: New file. ++ * testsuite/binutils-all/nm.hex.unicode ++ * testsuite/binutils-all/strings.escape.unicode ++ * testsuite/binutils-all/objdump.highlight.unicode ++ * testsuite/binutils-all/readelf.invalid.unicode ++ + 2021-02-09 Alan Modra + + PR 27382 +diff --git a/binutils/doc/binutils.texi b/binutils/doc/binutils.texi +--- a/binutils/doc/binutils.texi 2021-12-23 03:23:38.441843395 -0800 ++++ b/binutils/doc/binutils.texi 2021-12-23 03:30:31.094968942 -0800 +@@ -805,6 +805,7 @@ nm [@option{-A}|@option{-o}|@option{--pr + [@option{-s}|@option{--print-armap}] [@option{-t} @var{radix}|@option{--radix=}@var{radix}] + [@option{-u}|@option{--undefined-only}] [@option{-V}|@option{--version}] + [@option{-X 32_64}] [@option{--defined-only}] [@option{--no-demangle}] ++ [@option{-U} @var{method}] [@option{--unicode=}@var{method}] + [@option{--plugin} @var{name}] + [@option{--no-recurse-limit}|@option{--recurse-limit}]] + [@option{--size-sort}] [@option{--special-syms}] +@@ -1114,6 +1115,21 @@ Use @var{radix} as the radix for printin + @cindex undefined symbols + Display only undefined symbols (those external to each object file). + ++@item -U @var{[d|i|l|e|x|h]} ++@itemx --unicode=@var{[default|invalid|locale|escape|hex|highlight]} ++Controls the display of UTF-8 encoded mulibyte characters in strings. ++The default (@option{--unicode=default}) is to give them no special ++treatment. The @option{--unicode=locale} option displays the sequence ++in the current locale, which may or may not support them. The options ++@option{--unicode=hex} and @option{--unicode=invalid} display them as ++hex byte sequences enclosed by either angle brackets or curly braces. ++ ++The @option{--unicode=escape} option displays them as escape sequences ++(@var{\uxxxx}) and the @option{--unicode=highlight} option displays ++them as escape sequences highlighted in red (if supported by the ++output device). The colouring is intended to draw attention to the ++presence of unicode sequences where they might not be expected. ++ + @item -V + @itemx --version + Show the version number of @command{nm} and exit. +@@ -2210,6 +2226,7 @@ objdump [@option{-a}|@option{--archive-h + [@option{--prefix-strip=}@var{level}] + [@option{--insn-width=}@var{width}] + [@option{--visualize-jumps[=color|=extended-color|=off]} ++ [@option{-U} @var{method}] [@option{--unicode=}@var{method}] + [@option{-V}|@option{--version}] + [@option{-H}|@option{--help}] + @var{objfile}@dots{} +@@ -2877,6 +2894,21 @@ When displaying symbols include those wh + special in some way and which would not normally be of interest to the + user. + ++@item -U @var{[d|i|l|e|x|h]} ++@itemx --unicode=@var{[default|invalid|locale|escape|hex|highlight]} ++Controls the display of UTF-8 encoded mulibyte characters in strings. ++The default (@option{--unicode=default}) is to give them no special ++treatment. The @option{--unicode=locale} option displays the sequence ++in the current locale, which may or may not support them. The options ++@option{--unicode=hex} and @option{--unicode=invalid} display them as ++hex byte sequences enclosed by either angle brackets or curly braces. ++ ++The @option{--unicode=escape} option displays them as escape sequences ++(@var{\uxxxx}) and the @option{--unicode=highlight} option displays ++them as escape sequences highlighted in red (if supported by the ++output device). The colouring is intended to draw attention to the ++presence of unicode sequences where they might not be expected. ++ + @item -V + @itemx --version + Print the version number of @command{objdump} and exit. +@@ -3153,6 +3185,7 @@ strings [@option{-afovV}] [@option{-}@va + [@option{-n} @var{min-len}] [@option{--bytes=}@var{min-len}] + [@option{-t} @var{radix}] [@option{--radix=}@var{radix}] + [@option{-e} @var{encoding}] [@option{--encoding=}@var{encoding}] ++ [@option{-U} @var{method}] [@option{--unicode=}@var{method}] + [@option{-}] [@option{--all}] [@option{--print-file-name}] + [@option{-T} @var{bfdname}] [@option{--target=}@var{bfdname}] + [@option{-w}] [@option{--include-all-whitespace}] +@@ -3244,6 +3277,28 @@ single-8-bit-byte characters, @samp{b} = + littleendian. Useful for finding wide character strings. (@samp{l} + and @samp{b} apply to, for example, Unicode UTF-16/UCS-2 encodings). + ++@item -U @var{[d|i|l|e|x|h]} ++@itemx --unicode=@var{[default|invalid|locale|escape|hex|highlight]} ++Controls the display of UTF-8 encoded mulibyte characters in strings. ++The default (@option{--unicode=default}) is to give them no special ++treatment, and instead rely upon the setting of the ++@option{--encoding} option. The other values for this option ++automatically enable @option{--encoding=S}. ++ ++The @option{--unicode=invalid} option treats them as non-graphic ++characters and hence not part of a valid string. All the remaining ++options treat them as valid string characters. ++ ++The @option{--unicode=locale} option displays them in the current ++locale, which may or may not support UTF-8 encoding. The ++@option{--unicode=hex} option displays them as hex byte sequences ++enclosed between @var{<>} characters. The @option{--unicode=escape} ++option displays them as escape sequences (@var{\uxxxx}) and the ++@option{--unicode=highlight} option displays them as escape sequences ++highlighted in red (if supported by the output device). The colouring ++is intended to draw attention to the presence of unicode sequences ++where they might not be expected. ++ + @item -T @var{bfdname} + @itemx --target=@var{bfdname} + @cindex object code format +@@ -4740,6 +4795,7 @@ readelf [@option{-a}|@option{--all}] + [@option{--dyn-syms}|@option{--lto-syms}] + [@option{--demangle@var{=style}}|@option{--no-demangle}] + [@option{--recurse-limit}|@option{--no-recurse-limit}] ++ [@option{-U} @var{method}|@option{--unicode=}@var{method}] + [@option{-n}|@option{--notes}] + [@option{-r}|@option{--relocs}] + [@option{-u}|@option{--unwind}] +@@ -4887,6 +4943,28 @@ necessary in order to demangle truly com + that if the recursion limit is disabled then stack exhaustion is + possible and any bug reports about such an event will be rejected. + ++@item -U @var{[d|i|l|e|x|h]} ++@itemx --unicode=[default|invalid|locale|escape|hex|highlight] ++Controls the display of non-ASCII characters in identifier names. ++The default (@option{--unicode=locale} or @option{--unicode=default}) is ++to treat them as multibyte characters and display them in the current ++locale. All other versions of this option treat the bytes as UTF-8 ++encoded values and attempt to interpret them. If they cannot be ++interpreted or if the @option{--unicode=invalid} option is used then ++they are displayed as a sequence of hex bytes, encloses in curly ++parethesis characters. ++ ++Using the @option{--unicode=escape} option will display the characters ++as as unicode escape sequences (@var{\uxxxx}). Using the ++@option{--unicode=hex} will display the characters as hex byte ++sequences enclosed between angle brackets. ++ ++Using the @option{--unicode=highlight} will display the characters as ++unicode escape sequences but it will also highlighted them in red, ++assuming that colouring is supported by the output device. The ++colouring is intended to draw attention to the presence of unicode ++sequences when they might not be expected. ++ + @item -e + @itemx --headers + Display all the headers in the file. Equivalent to @option{-h -l -S}. +diff --git a/binutils/NEWS b/binutils/NEWS +--- a/binutils/NEWS 2021-12-23 03:23:38.433843528 -0800 ++++ b/binutils/NEWS 2021-12-23 03:30:31.094968942 -0800 +@@ -1,5 +1,14 @@ + -*- text -*- + ++* Tools which display symbols or strings (readelf, strings, nm, objdump) ++ have a new command line option which controls how unicode characters are ++ handled. By default they are treated as normal for the tool. Using ++ --unicode=locale will display them according to the current locale. ++ Using --unicode=hex will display them as hex byte values, whilst ++ --unicode=escape will display them as escape sequences. In addition ++ using --unicode=highlight will display them as unicode escape sequences ++ highlighted in red (if supported by the output device). ++ + Changes in 2.36: + + * Update elfedit and readelf with LAM_U48 and LAM_U57 support. +diff --git a/binutils/nm.c b/binutils/nm.c +--- a/binutils/nm.c 2021-12-23 03:23:38.441843395 -0800 ++++ b/binutils/nm.c 2021-12-23 03:30:31.098968875 -0800 +@@ -38,6 +38,11 @@ + #include "bucomm.h" + #include "plugin-api.h" + #include "plugin.h" ++#include "safe-ctype.h" ++ ++#ifndef streq ++#define streq(a,b) (strcmp ((a),(b)) == 0) ++#endif + + /* When sorting by size, we use this structure to hold the size and a + pointer to the minisymbol. */ +@@ -192,6 +197,18 @@ static const char *plugin_target = NULL; + static bfd *lineno_cache_bfd; + static bfd *lineno_cache_rel_bfd; + ++typedef enum unicode_display_type ++{ ++ unicode_default = 0, ++ unicode_locale, ++ unicode_escape, ++ unicode_hex, ++ unicode_highlight, ++ unicode_invalid ++} unicode_display_type; ++ ++static unicode_display_type unicode_display = unicode_default; ++ + enum long_option_values + { + OPTION_TARGET = 200, +@@ -234,6 +251,7 @@ static struct option long_options[] = + {"target", required_argument, 0, OPTION_TARGET}, + {"defined-only", no_argument, &defined_only, 1}, + {"undefined-only", no_argument, &undefined_only, 1}, ++ {"unicode", required_argument, NULL, 'U'}, + {"version", no_argument, &show_version, 1}, + {"with-symbol-versions", no_argument, NULL, + OPTION_WITH_SYMBOL_VERSIONS}, +@@ -285,6 +303,8 @@ usage (FILE *stream, int status) + -t, --radix=RADIX Use RADIX for printing symbol values\n\ + --target=BFDNAME Specify the target object format as BFDNAME\n\ + -u, --undefined-only Display only undefined symbols\n\ ++ -U {d|s|i|x|e|h} Specify how to treat UTF-8 encoded unicode characters\n\ ++ --unicode={default|show|invalid|hex|escape|highlight}\n\ + --with-symbol-versions Display version strings after symbol names\n\ + -X 32_64 (ignored)\n\ + @FILE Read options from FILE\n\ +@@ -399,6 +419,188 @@ get_coff_symbol_type (const struct inter + fatal ("%s", xstrerror (errno)); + return bufp; + } ++ ++/* Convert a potential UTF-8 encoded sequence in IN into characters in OUT. ++ The conversion format is controlled by the unicode_display variable. ++ Returns the number of characters added to OUT. ++ Returns the number of bytes consumed from IN in CONSUMED. ++ Always consumes at least one byte and displays at least one character. */ ++ ++static unsigned int ++display_utf8 (const unsigned char * in, char * out, unsigned int * consumed) ++{ ++ char * orig_out = out; ++ unsigned int nchars = 0; ++ unsigned int j; ++ ++ if (unicode_display == unicode_default) ++ goto invalid; ++ ++ if (in[0] < 0xc0) ++ goto invalid; ++ ++ if ((in[1] & 0xc0) != 0x80) ++ goto invalid; ++ ++ if ((in[0] & 0x20) == 0) ++ { ++ nchars = 2; ++ goto valid; ++ } ++ ++ if ((in[2] & 0xc0) != 0x80) ++ goto invalid; ++ ++ if ((in[0] & 0x10) == 0) ++ { ++ nchars = 3; ++ goto valid; ++ } ++ ++ if ((in[3] & 0xc0) != 0x80) ++ goto invalid; ++ ++ nchars = 4; ++ ++ valid: ++ switch (unicode_display) ++ { ++ case unicode_locale: ++ /* Copy the bytes into the output buffer as is. */ ++ memcpy (out, in, nchars); ++ out += nchars; ++ break; ++ ++ case unicode_invalid: ++ case unicode_hex: ++ out += sprintf (out, "%c", unicode_display == unicode_hex ? '<' : '{'); ++ out += sprintf (out, "0x"); ++ for (j = 0; j < nchars; j++) ++ out += sprintf (out, "%02x", in [j]); ++ out += sprintf (out, "%c", unicode_display == unicode_hex ? '>' : '}'); ++ break; ++ ++ case unicode_highlight: ++ if (isatty (1)) ++ out += sprintf (out, "\x1B[31;47m"); /* Red. */ ++ /* Fall through. */ ++ case unicode_escape: ++ switch (nchars) ++ { ++ case 2: ++ out += sprintf (out, "\\u%02x%02x", ++ ((in[0] & 0x1c) >> 2), ++ ((in[0] & 0x03) << 6) | (in[1] & 0x3f)); ++ break; ++ ++ case 3: ++ out += sprintf (out, "\\u%02x%02x", ++ ((in[0] & 0x0f) << 4) | ((in[1] & 0x3c) >> 2), ++ ((in[1] & 0x03) << 6) | ((in[2] & 0x3f))); ++ break; ++ ++ case 4: ++ out += sprintf (out, "\\u%02x%02x%02x", ++ ((in[0] & 0x07) << 6) | ((in[1] & 0x3c) >> 2), ++ ((in[1] & 0x03) << 6) | ((in[2] & 0x3c) >> 2), ++ ((in[2] & 0x03) << 6) | ((in[3] & 0x3f))); ++ break; ++ default: ++ /* URG. */ ++ break; ++ } ++ ++ if (unicode_display == unicode_highlight && isatty (1)) ++ out += sprintf (out, "\033[0m"); /* Default colour. */ ++ break; ++ ++ default: ++ /* URG */ ++ break; ++ } ++ ++ * consumed = nchars; ++ return out - orig_out; ++ ++ invalid: ++ /* Not a valid UTF-8 sequence. */ ++ *out = *in; ++ * consumed = 1; ++ return 1; ++} ++ ++/* Convert any UTF-8 encoded characters in NAME into the form specified by ++ unicode_display. Also converts control characters. Returns a static ++ buffer if conversion was necessary. ++ Code stolen from objdump.c:sanitize_string(). */ ++ ++static const char * ++convert_utf8 (const char * in) ++{ ++ static char * buffer = NULL; ++ static size_t buffer_len = 0; ++ const char * original = in; ++ char * out; ++ ++ /* Paranoia. */ ++ if (in == NULL) ++ return ""; ++ ++ /* See if any conversion is necessary. ++ In the majority of cases it will not be needed. */ ++ do ++ { ++ unsigned char c = *in++; ++ ++ if (c == 0) ++ return original; ++ ++ if (ISCNTRL (c)) ++ break; ++ ++ if (unicode_display != unicode_default && c >= 0xc0) ++ break; ++ } ++ while (1); ++ ++ /* Copy the input, translating as needed. */ ++ in = original; ++ if (buffer_len < (strlen (in) * 9)) ++ { ++ free ((void *) buffer); ++ buffer_len = strlen (in) * 9; ++ buffer = xmalloc (buffer_len + 1); ++ } ++ ++ out = buffer; ++ do ++ { ++ unsigned char c = *in++; ++ ++ if (c == 0) ++ break; ++ ++ if (ISCNTRL (c)) ++ { ++ *out++ = '^'; ++ *out++ = c + 0x40; ++ } ++ else if (unicode_display != unicode_default && c >= 0xc0) ++ { ++ unsigned int num_consumed; ++ ++ out += display_utf8 ((const unsigned char *)(in - 1), out, & num_consumed); ++ in += num_consumed - 1; ++ } ++ else ++ *out++ = c; ++ } ++ while (1); ++ ++ *out = 0; ++ return buffer; ++} ++ + + /* Print symbol name NAME, read from ABFD, with printf format FORM, + demangling it if requested. */ +@@ -418,6 +620,11 @@ print_symname (const char *form, struct + name = alloc; + } + ++ if (unicode_display != unicode_default) ++ { ++ name = convert_utf8 (name); ++ } ++ + if (info != NULL && info->elfinfo) + { + const char *version_string; +@@ -1738,7 +1945,7 @@ main (int argc, char **argv) + fatal (_("fatal error: libbfd ABI mismatch")); + set_default_bfd_target (); + +- while ((c = getopt_long (argc, argv, "aABCDef:gHhlnopPrSst:uvVvX:", ++ while ((c = getopt_long (argc, argv, "aABCDef:gHhlnopPrSst:uU:vVvX:", + long_options, (int *) 0)) != EOF) + { + switch (c) +@@ -1828,6 +2035,24 @@ main (int argc, char **argv) + case 'u': + undefined_only = 1; + break; ++ ++ case 'U': ++ if (streq (optarg, "default") || streq (optarg, "d")) ++ unicode_display = unicode_default; ++ else if (streq (optarg, "locale") || streq (optarg, "l")) ++ unicode_display = unicode_locale; ++ else if (streq (optarg, "escape") || streq (optarg, "e")) ++ unicode_display = unicode_escape; ++ else if (streq (optarg, "invalid") || streq (optarg, "i")) ++ unicode_display = unicode_invalid; ++ else if (streq (optarg, "hex") || streq (optarg, "x")) ++ unicode_display = unicode_hex; ++ else if (streq (optarg, "highlight") || streq (optarg, "h")) ++ unicode_display = unicode_highlight; ++ else ++ fatal (_("invalid argument to -U/--unicode: %s"), optarg); ++ break; ++ + case 'V': + show_version = 1; + break; +diff --git a/binutils/objdump.c b/binutils/objdump.c +--- a/binutils/objdump.c 2021-12-23 03:23:38.445843329 -0800 ++++ b/binutils/objdump.c 2021-12-23 03:30:31.098968875 -0800 +@@ -205,6 +205,19 @@ static const struct objdump_private_desc + + /* The list of detected jumps inside a function. */ + static struct jump_info *detected_jumps = NULL; ++ ++typedef enum unicode_display_type ++{ ++ unicode_default = 0, ++ unicode_locale, ++ unicode_escape, ++ unicode_hex, ++ unicode_highlight, ++ unicode_invalid ++} unicode_display_type; ++ ++static unicode_display_type unicode_display = unicode_default; ++ + + static void usage (FILE *, int) ATTRIBUTE_NORETURN; + static void +@@ -274,6 +287,8 @@ usage (FILE *stream, int status) + --recurse-limit Enable a limit on recursion whilst demangling. [Default]\n\ + --no-recurse-limit Disable a limit on recursion whilst demangling\n\ + -w, --wide Format output for more than 80 columns\n\ ++ -U[d|l|i|x|e|h] Controls the display of UTF-8 unicode characters\n\ ++ --unicode=[default|locale|invalid|hex|escape|highlight]\n\ + -z, --disassemble-zeroes Do not skip blocks of zeroes when disassembling\n\ + --start-address=ADDR Only process data whose address is >= ADDR\n\ + --stop-address=ADDR Only process data whose address is < ADDR\n\ +@@ -348,17 +363,23 @@ static struct option long_options[]= + { + {"adjust-vma", required_argument, NULL, OPTION_ADJUST_VMA}, + {"all-headers", no_argument, NULL, 'x'}, +- {"private-headers", no_argument, NULL, 'p'}, +- {"private", required_argument, NULL, 'P'}, + {"architecture", required_argument, NULL, 'm'}, + {"archive-headers", no_argument, NULL, 'a'}, ++#ifdef ENABLE_LIBCTF ++ {"ctf", required_argument, NULL, OPTION_CTF}, ++ {"ctf-parent", required_argument, NULL, OPTION_CTF_PARENT}, ++#endif + {"debugging", no_argument, NULL, 'g'}, + {"debugging-tags", no_argument, NULL, 'e'}, + {"demangle", optional_argument, NULL, 'C'}, + {"disassemble", optional_argument, NULL, 'd'}, + {"disassemble-all", no_argument, NULL, 'D'}, +- {"disassembler-options", required_argument, NULL, 'M'}, + {"disassemble-zeroes", no_argument, NULL, 'z'}, ++ {"disassembler-options", required_argument, NULL, 'M'}, ++ {"dwarf", optional_argument, NULL, OPTION_DWARF}, ++ {"dwarf-check", no_argument, 0, OPTION_DWARF_CHECK}, ++ {"dwarf-depth", required_argument, 0, OPTION_DWARF_DEPTH}, ++ {"dwarf-start", required_argument, 0, OPTION_DWARF_START}, + {"dynamic-reloc", no_argument, NULL, 'R'}, + {"dynamic-syms", no_argument, NULL, 'T'}, + {"endian", required_argument, NULL, OPTION_ENDIAN}, +@@ -368,15 +389,22 @@ static struct option long_options[]= + {"full-contents", no_argument, NULL, 's'}, + {"headers", no_argument, NULL, 'h'}, + {"help", no_argument, NULL, 'H'}, ++ {"include", required_argument, NULL, 'I'}, + {"info", no_argument, NULL, 'i'}, ++ {"inlines", no_argument, 0, OPTION_INLINES}, ++ {"insn-width", required_argument, NULL, OPTION_INSN_WIDTH}, + {"line-numbers", no_argument, NULL, 'l'}, +- {"no-show-raw-insn", no_argument, &show_raw_insn, -1}, + {"no-addresses", no_argument, &no_addresses, 1}, ++ {"no-recurse-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT}, ++ {"no-recursion-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT}, ++ {"no-show-raw-insn", no_argument, &show_raw_insn, -1}, ++ {"prefix", required_argument, NULL, OPTION_PREFIX}, + {"prefix-addresses", no_argument, &prefix_addresses, 1}, ++ {"prefix-strip", required_argument, NULL, OPTION_PREFIX_STRIP}, ++ {"private", required_argument, NULL, 'P'}, ++ {"private-headers", no_argument, NULL, 'p'}, + {"recurse-limit", no_argument, NULL, OPTION_RECURSE_LIMIT}, + {"recursion-limit", no_argument, NULL, OPTION_RECURSE_LIMIT}, +- {"no-recurse-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT}, +- {"no-recursion-limit", no_argument, NULL, OPTION_NO_RECURSE_LIMIT}, + {"reloc", no_argument, NULL, 'r'}, + {"section", required_argument, NULL, 'j'}, + {"section-headers", no_argument, NULL, 'h'}, +@@ -384,28 +412,16 @@ static struct option long_options[]= + {"source", no_argument, NULL, 'S'}, + {"source-comment", optional_argument, NULL, OPTION_SOURCE_COMMENT}, + {"special-syms", no_argument, &dump_special_syms, 1}, +- {"include", required_argument, NULL, 'I'}, +- {"dwarf", optional_argument, NULL, OPTION_DWARF}, +-#ifdef ENABLE_LIBCTF +- {"ctf", required_argument, NULL, OPTION_CTF}, +- {"ctf-parent", required_argument, NULL, OPTION_CTF_PARENT}, +-#endif + {"stabs", no_argument, NULL, 'G'}, + {"start-address", required_argument, NULL, OPTION_START_ADDRESS}, + {"stop-address", required_argument, NULL, OPTION_STOP_ADDRESS}, + {"syms", no_argument, NULL, 't'}, + {"target", required_argument, NULL, 'b'}, ++ {"unicode", required_argument, NULL, 'U'}, + {"version", no_argument, NULL, 'V'}, +- {"wide", no_argument, NULL, 'w'}, +- {"prefix", required_argument, NULL, OPTION_PREFIX}, +- {"prefix-strip", required_argument, NULL, OPTION_PREFIX_STRIP}, +- {"insn-width", required_argument, NULL, OPTION_INSN_WIDTH}, +- {"dwarf-depth", required_argument, 0, OPTION_DWARF_DEPTH}, +- {"dwarf-start", required_argument, 0, OPTION_DWARF_START}, +- {"dwarf-check", no_argument, 0, OPTION_DWARF_CHECK}, +- {"inlines", no_argument, 0, OPTION_INLINES}, + {"visualize-jumps", optional_argument, 0, OPTION_VISUALIZE_JUMPS}, +- {0, no_argument, 0, 0} ++ {"wide", no_argument, NULL, 'w'}, ++ {NULL, no_argument, NULL, 0} + }; + + static void +@@ -415,9 +431,121 @@ nonfatal (const char *msg) + exit_status = 1; + } + ++/* Convert a potential UTF-8 encoded sequence in IN into characters in OUT. ++ The conversion format is controlled by the unicode_display variable. ++ Returns the number of characters added to OUT. ++ Returns the number of bytes consumed from IN in CONSUMED. ++ Always consumes at least one byte and displays at least one character. */ ++ ++static unsigned int ++display_utf8 (const unsigned char * in, char * out, unsigned int * consumed) ++{ ++ char * orig_out = out; ++ unsigned int nchars = 0; ++ unsigned int j; ++ ++ if (unicode_display == unicode_default) ++ goto invalid; ++ ++ if (in[0] < 0xc0) ++ goto invalid; ++ ++ if ((in[1] & 0xc0) != 0x80) ++ goto invalid; ++ ++ if ((in[0] & 0x20) == 0) ++ { ++ nchars = 2; ++ goto valid; ++ } ++ ++ if ((in[2] & 0xc0) != 0x80) ++ goto invalid; ++ ++ if ((in[0] & 0x10) == 0) ++ { ++ nchars = 3; ++ goto valid; ++ } ++ ++ if ((in[3] & 0xc0) != 0x80) ++ goto invalid; ++ ++ nchars = 4; ++ ++ valid: ++ switch (unicode_display) ++ { ++ case unicode_locale: ++ /* Copy the bytes into the output buffer as is. */ ++ memcpy (out, in, nchars); ++ out += nchars; ++ break; ++ ++ case unicode_invalid: ++ case unicode_hex: ++ out += sprintf (out, "%c", unicode_display == unicode_hex ? '<' : '{'); ++ out += sprintf (out, "0x"); ++ for (j = 0; j < nchars; j++) ++ out += sprintf (out, "%02x", in [j]); ++ out += sprintf (out, "%c", unicode_display == unicode_hex ? '>' : '}'); ++ break; ++ ++ case unicode_highlight: ++ if (isatty (1)) ++ out += sprintf (out, "\x1B[31;47m"); /* Red. */ ++ /* Fall through. */ ++ case unicode_escape: ++ switch (nchars) ++ { ++ case 2: ++ out += sprintf (out, "\\u%02x%02x", ++ ((in[0] & 0x1c) >> 2), ++ ((in[0] & 0x03) << 6) | (in[1] & 0x3f)); ++ break; ++ ++ case 3: ++ out += sprintf (out, "\\u%02x%02x", ++ ((in[0] & 0x0f) << 4) | ((in[1] & 0x3c) >> 2), ++ ((in[1] & 0x03) << 6) | ((in[2] & 0x3f))); ++ break; ++ ++ case 4: ++ out += sprintf (out, "\\u%02x%02x%02x", ++ ((in[0] & 0x07) << 6) | ((in[1] & 0x3c) >> 2), ++ ((in[1] & 0x03) << 6) | ((in[2] & 0x3c) >> 2), ++ ((in[2] & 0x03) << 6) | ((in[3] & 0x3f))); ++ break; ++ default: ++ /* URG. */ ++ break; ++ } ++ ++ if (unicode_display == unicode_highlight && isatty (1)) ++ out += sprintf (out, "\033[0m"); /* Default colour. */ ++ break; ++ ++ default: ++ /* URG */ ++ break; ++ } ++ ++ * consumed = nchars; ++ return out - orig_out; ++ ++ invalid: ++ /* Not a valid UTF-8 sequence. */ ++ *out = *in; ++ * consumed = 1; ++ return 1; ++} ++ + /* Returns a version of IN with any control characters + replaced by escape sequences. Uses a static buffer +- if necessary. */ ++ if necessary. ++ ++ If unicode display is enabled, then also handles the ++ conversion of unicode characters. */ + + static const char * + sanitize_string (const char * in) +@@ -435,40 +563,50 @@ sanitize_string (const char * in) + of cases it will not be needed. */ + do + { +- char c = *in++; ++ unsigned char c = *in++; + + if (c == 0) + return original; + + if (ISCNTRL (c)) + break; ++ ++ if (unicode_display != unicode_default && c >= 0xc0) ++ break; + } + while (1); + + /* Copy the input, translating as needed. */ + in = original; +- if (buffer_len < (strlen (in) * 2)) ++ if (buffer_len < (strlen (in) * 9)) + { + free ((void *) buffer); +- buffer_len = strlen (in) * 2; ++ buffer_len = strlen (in) * 9; + buffer = xmalloc (buffer_len + 1); + } + + out = buffer; + do + { +- char c = *in++; ++ unsigned char c = *in++; + + if (c == 0) + break; + +- if (!ISCNTRL (c)) +- *out++ = c; +- else ++ if (ISCNTRL (c)) + { + *out++ = '^'; + *out++ = c + 0x40; + } ++ else if (unicode_display != unicode_default && c >= 0xc0) ++ { ++ unsigned int num_consumed; ++ ++ out += display_utf8 ((const unsigned char *)(in - 1), out, & num_consumed); ++ in += num_consumed - 1; ++ } ++ else ++ *out++ = c; + } + while (1); + +@@ -4481,6 +4619,24 @@ dump_symbols (bfd *abfd ATTRIBUTE_UNUSED + free (alloc); + } + } ++ else if (unicode_display != unicode_default ++ && name != NULL && *name != '\0') ++ { ++ const char * sanitized_name; ++ ++ /* If we want to sanitize the name, we do it here, and ++ temporarily clobber it while calling bfd_print_symbol. ++ FIXME: This is a gross hack. */ ++ sanitized_name = sanitize_string (name); ++ if (sanitized_name != name) ++ (*current)->name = sanitized_name; ++ else ++ sanitized_name = NULL; ++ bfd_print_symbol (cur_bfd, stdout, *current, ++ bfd_print_symbol_all); ++ if (sanitized_name != NULL) ++ (*current)->name = name; ++ } + else + bfd_print_symbol (cur_bfd, stdout, *current, + bfd_print_symbol_all); +@@ -5162,7 +5318,7 @@ main (int argc, char **argv) + set_default_bfd_target (); + + while ((c = getopt_long (argc, argv, +- "pP:ib:m:M:VvCdDlfFaHhrRtTxsSI:j:wE:zgeGW::", ++ "pP:ib:m:U:M:VvCdDlfFaHhrRtTxsSI:j:wE:zgeGW::", + long_options, (int *) 0)) + != EOF) + { +@@ -5441,6 +5597,23 @@ main (int argc, char **argv) + seenflag = TRUE; + break; + ++ case 'U': ++ if (streq (optarg, "default") || streq (optarg, "d")) ++ unicode_display = unicode_default; ++ else if (streq (optarg, "locale") || streq (optarg, "l")) ++ unicode_display = unicode_locale; ++ else if (streq (optarg, "escape") || streq (optarg, "e")) ++ unicode_display = unicode_escape; ++ else if (streq (optarg, "invalid") || streq (optarg, "i")) ++ unicode_display = unicode_invalid; ++ else if (streq (optarg, "hex") || streq (optarg, "x")) ++ unicode_display = unicode_hex; ++ else if (streq (optarg, "highlight") || streq (optarg, "h")) ++ unicode_display = unicode_highlight; ++ else ++ fatal (_("invalid argument to -U/--unicode: %s"), optarg); ++ break; ++ + case 'H': + usage (stdout, 0); + /* No need to set seenflag or to break - usage() does not return. */ +diff --git a/binutils/readelf.c b/binutils/readelf.c +--- a/binutils/readelf.c 2021-12-23 03:23:42.065783023 -0800 ++++ b/binutils/readelf.c 2021-12-23 03:30:36.582877519 -0800 +@@ -321,6 +321,19 @@ typedef enum print_mode + } + print_mode; + ++typedef enum unicode_display_type ++{ ++ unicode_default = 0, ++ unicode_locale, ++ unicode_escape, ++ unicode_hex, ++ unicode_highlight, ++ unicode_invalid ++} unicode_display_type; ++ ++static unicode_display_type unicode_display = unicode_default; ++ ++ + /* Versioned symbol info. */ + enum versioned_symbol_info + { +@@ -613,11 +626,18 @@ print_symbol (signed int width, const ch + if (c == 0) + break; + +- /* Do not print control characters directly as they can affect terminal +- settings. Such characters usually appear in the names generated +- by the assembler for local labels. */ +- if (ISCNTRL (c)) ++ if (ISPRINT (c)) ++ { ++ putchar (c); ++ width_remaining --; ++ num_printed ++; ++ } ++ else if (ISCNTRL (c)) + { ++ /* Do not print control characters directly as they can affect terminal ++ settings. Such characters usually appear in the names generated ++ by the assembler for local labels. */ ++ + if (width_remaining < 2) + break; + +@@ -625,11 +645,137 @@ print_symbol (signed int width, const ch + width_remaining -= 2; + num_printed += 2; + } +- else if (ISPRINT (c)) ++ else if (c == 0x7f) + { +- putchar (c); +- width_remaining --; +- num_printed ++; ++ if (width_remaining < 5) ++ break; ++ printf (""); ++ width_remaining -= 5; ++ num_printed += 5; ++ } ++ else if (unicode_display != unicode_locale ++ && unicode_display != unicode_default) ++ { ++ /* Display unicode characters as something else. */ ++ unsigned char bytes[4]; ++ bfd_boolean is_utf8; ++ unsigned int nbytes; ++ ++ bytes[0] = c; ++ ++ if (bytes[0] < 0xc0) ++ { ++ nbytes = 1; ++ is_utf8 = FALSE; ++ } ++ else ++ { ++ bytes[1] = *symbol++; ++ ++ if ((bytes[1] & 0xc0) != 0x80) ++ { ++ is_utf8 = FALSE; ++ /* Do not consume this character. It may only ++ be the first byte in the sequence that was ++ corrupt. */ ++ --symbol; ++ nbytes = 1; ++ } ++ else if ((bytes[0] & 0x20) == 0) ++ { ++ is_utf8 = TRUE; ++ nbytes = 2; ++ } ++ else ++ { ++ bytes[2] = *symbol++; ++ ++ if ((bytes[2] & 0xc0) != 0x80) ++ { ++ is_utf8 = FALSE; ++ symbol -= 2; ++ nbytes = 1; ++ } ++ else if ((bytes[0] & 0x10) == 0) ++ { ++ is_utf8 = TRUE; ++ nbytes = 3; ++ } ++ else ++ { ++ bytes[3] = *symbol++; ++ ++ nbytes = 4; ++ ++ if ((bytes[3] & 0xc0) != 0x80) ++ { ++ is_utf8 = FALSE; ++ symbol -= 3; ++ nbytes = 1; ++ } ++ else ++ is_utf8 = TRUE; ++ } ++ } ++ } ++ ++ if (unicode_display == unicode_invalid) ++ is_utf8 = FALSE; ++ ++ if (unicode_display == unicode_hex || ! is_utf8) ++ { ++ unsigned int i; ++ ++ if (width_remaining < (nbytes * 2) + 2) ++ break; ++ ++ putchar (is_utf8 ? '<' : '{'); ++ printf ("0x"); ++ for (i = 0; i < nbytes; i++) ++ printf ("%02x", bytes[i]); ++ putchar (is_utf8 ? '>' : '}'); ++ } ++ else ++ { ++ if (unicode_display == unicode_highlight && isatty (1)) ++ printf ("\x1B[31;47m"); /* Red. */ ++ ++ switch (nbytes) ++ { ++ case 2: ++ if (width_remaining < 6) ++ break; ++ printf ("\\u%02x%02x", ++ (bytes[0] & 0x1c) >> 2, ++ ((bytes[0] & 0x03) << 6) | (bytes[1] & 0x3f)); ++ break; ++ case 3: ++ if (width_remaining < 6) ++ break; ++ printf ("\\u%02x%02x", ++ ((bytes[0] & 0x0f) << 4) | ((bytes[1] & 0x3c) >> 2), ++ ((bytes[1] & 0x03) << 6) | (bytes[2] & 0x3f)); ++ break; ++ case 4: ++ if (width_remaining < 8) ++ break; ++ printf ("\\u%02x%02x%02x", ++ ((bytes[0] & 0x07) << 6) | ((bytes[1] & 0x3c) >> 2), ++ ((bytes[1] & 0x03) << 6) | ((bytes[2] & 0x3c) >> 2), ++ ((bytes[2] & 0x03) << 6) | (bytes[3] & 0x3f)); ++ ++ break; ++ default: ++ /* URG. */ ++ break; ++ } ++ ++ if (unicode_display == unicode_highlight && isatty (1)) ++ printf ("\033[0m"); /* Default colour. */ ++ } ++ ++ if (bytes[nbytes - 1] == 0) ++ break; + } + else + { +@@ -4556,6 +4702,7 @@ static struct option options[] = + {"syms", no_argument, 0, 's'}, + {"silent-truncation",no_argument, 0, 'T'}, + {"section-details", no_argument, 0, 't'}, ++ {"unicode", required_argument, NULL, 'U'}, + {"unwind", no_argument, 0, 'u'}, + {"version-info", no_argument, 0, 'V'}, + {"version", no_argument, 0, 'v'}, +@@ -4609,6 +4756,11 @@ usage (FILE * stream) + --no-demangle Do not demangle low-level symbol names. (This is the default)\n\ + --recurse-limit Enable a demangling recursion limit. (This is the default)\n\ + --no-recurse-limit Disable a demangling recursion limit\n\ ++ -U[dlexhi] --unicode=[default|locale|escape|hex|highlight|invalid]\n\ ++ Display unicode characters as determined by the current locale\n\ ++ (default), escape sequences, \"\", highlighted\n\ ++ escape sequences, or treat them as invalid and display as\n\ ++ \"{hex sequences}\"\n\ + -n --notes Display the core notes (if present)\n\ + -r --relocs Display the relocations (if present)\n\ + -u --unwind Display the unwind info (if present)\n\ +@@ -4749,7 +4901,7 @@ parse_args (struct dump_data *dumpdata, + usage (stderr); + + while ((c = getopt_long +- (argc, argv, "ACDHILNR:STVWacdeghi:lnp:rstuvw::x:z", options, NULL)) != EOF) ++ (argc, argv, "ACDHILNR:STU:VWacdeghi:lnp:rstuvw::x:z", options, NULL)) != EOF) + { + switch (c) + { +@@ -4943,6 +5095,24 @@ parse_args (struct dump_data *dumpdata, + case OPTION_WITH_SYMBOL_VERSIONS: + /* Ignored for backward compatibility. */ + break; ++ case 'U': ++ if (optarg == NULL) ++ error (_("Missing arg to -U/--unicode")); /* Can this happen ? */ ++ else if (streq (optarg, "default") || streq (optarg, "d")) ++ unicode_display = unicode_default; ++ else if (streq (optarg, "locale") || streq (optarg, "l")) ++ unicode_display = unicode_locale; ++ else if (streq (optarg, "escape") || streq (optarg, "e")) ++ unicode_display = unicode_escape; ++ else if (streq (optarg, "invalid") || streq (optarg, "i")) ++ unicode_display = unicode_invalid; ++ else if (streq (optarg, "hex") || streq (optarg, "x")) ++ unicode_display = unicode_hex; ++ else if (streq (optarg, "highlight") || streq (optarg, "h")) ++ unicode_display = unicode_highlight; ++ else ++ error (_("invalid argument to -U/--unicode: %s"), optarg); ++ break; + + default: + /* xgettext:c-format */ +diff --git a/binutils/strings.c b/binutils/strings.c +--- a/binutils/strings.c 2021-12-23 03:23:38.485842662 -0800 ++++ b/binutils/strings.c 2021-12-23 03:30:36.586877452 -0800 +@@ -55,6 +55,19 @@ + -T {bfdname} + Specify a non-default object file format. + ++ --unicode={default|locale|invalid|hex|escape|highlight} ++ -u {d|l|i|x|e|h} ++ Determine how to handle UTF-8 unicode characters. The default ++ is no special treatment. All other versions of this option ++ only apply if the encoding is valid and enabling the option ++ implies --encoding=S. ++ The 'locale' option displays the characters according to the ++ current locale. The 'invalid' option treats them as ++ non-string characters. The 'hex' option displays them as hex ++ byte sequences. The 'escape' option displays them as escape ++ sequences and the 'highlight' option displays them as ++ coloured escape sequences. ++ + --output-separator=sep_string + -s sep_string String used to separate parsed strings in output. + Default is newline. +@@ -76,6 +89,22 @@ + #include "safe-ctype.h" + #include "bucomm.h" + ++#ifndef streq ++#define streq(a,b) (strcmp ((a),(b)) == 0) ++#endif ++ ++typedef enum unicode_display_type ++{ ++ unicode_default = 0, ++ unicode_locale, ++ unicode_escape, ++ unicode_hex, ++ unicode_highlight, ++ unicode_invalid ++} unicode_display_type; ++ ++static unicode_display_type unicode_display = unicode_default; ++ + #define STRING_ISGRAPHIC(c) \ + ( (c) >= 0 \ + && (c) <= 255 \ +@@ -94,7 +123,7 @@ extern int errno; + static int address_radix; + + /* Minimum length of sequence of graphic chars to trigger output. */ +-static int string_min; ++static unsigned int string_min; + + /* Whether or not we include all whitespace as a graphic char. */ + static bfd_boolean include_all_whitespace; +@@ -121,21 +150,22 @@ static char *output_separator; + static struct option long_options[] = + { + {"all", no_argument, NULL, 'a'}, ++ {"bytes", required_argument, NULL, 'n'}, + {"data", no_argument, NULL, 'd'}, ++ {"encoding", required_argument, NULL, 'e'}, ++ {"help", no_argument, NULL, 'h'}, ++ {"include-all-whitespace", no_argument, NULL, 'w'}, ++ {"output-separator", required_argument, NULL, 's'}, + {"print-file-name", no_argument, NULL, 'f'}, +- {"bytes", required_argument, NULL, 'n'}, + {"radix", required_argument, NULL, 't'}, +- {"include-all-whitespace", no_argument, NULL, 'w'}, +- {"encoding", required_argument, NULL, 'e'}, + {"target", required_argument, NULL, 'T'}, +- {"output-separator", required_argument, NULL, 's'}, +- {"help", no_argument, NULL, 'h'}, ++ {"unicode", required_argument, NULL, 'U'}, + {"version", no_argument, NULL, 'v'}, + {NULL, 0, NULL, 0} + }; + + static bfd_boolean strings_file (char *); +-static void print_strings (const char *, FILE *, file_ptr, int, int, char *); ++static void print_strings (const char *, FILE *, file_ptr, int, char *); + static void usage (FILE *, int) ATTRIBUTE_NORETURN; + + int main (int, char **); +@@ -173,7 +203,7 @@ main (int argc, char **argv) + encoding = 's'; + output_separator = NULL; + +- while ((optc = getopt_long (argc, argv, "adfhHn:wot:e:T:s:Vv0123456789", ++ while ((optc = getopt_long (argc, argv, "adfhHn:wot:e:T:s:U:Vv0123456789", + long_options, (int *) 0)) != EOF) + { + switch (optc) +@@ -244,7 +274,24 @@ main (int argc, char **argv) + + case 's': + output_separator = optarg; +- break; ++ break; ++ ++ case 'U': ++ if (streq (optarg, "default") || streq (optarg, "d")) ++ unicode_display = unicode_default; ++ else if (streq (optarg, "locale") || streq (optarg, "l")) ++ unicode_display = unicode_locale; ++ else if (streq (optarg, "escape") || streq (optarg, "e")) ++ unicode_display = unicode_escape; ++ else if (streq (optarg, "invalid") || streq (optarg, "i")) ++ unicode_display = unicode_invalid; ++ else if (streq (optarg, "hex") || streq (optarg, "x")) ++ unicode_display = unicode_hex; ++ else if (streq (optarg, "highlight") || streq (optarg, "h")) ++ unicode_display = unicode_highlight; ++ else ++ fatal (_("invalid argument to -U/--unicode: %s"), optarg); ++ break; + + case 'V': + case 'v': +@@ -260,6 +307,9 @@ main (int argc, char **argv) + } + } + ++ if (unicode_display != unicode_default) ++ encoding = 'S'; ++ + if (numeric_opt != 0) + { + string_min = (int) strtoul (argv[numeric_opt - 1] + 1, &s, 0); +@@ -295,14 +345,14 @@ main (int argc, char **argv) + { + datasection_only = FALSE; + SET_BINARY (fileno (stdin)); +- print_strings ("{standard input}", stdin, 0, 0, 0, (char *) NULL); ++ print_strings ("{standard input}", stdin, 0, 0, (char *) NULL); + files_given = TRUE; + } + else + { + for (; optind < argc; ++optind) + { +- if (strcmp (argv[optind], "-") == 0) ++ if (streq (argv[optind], "-")) + datasection_only = FALSE; + else + { +@@ -344,7 +394,7 @@ strings_a_section (bfd *abfd, asection * + } + + *got_a_section = TRUE; +- print_strings (filename, NULL, sect->filepos, 0, sectsize, (char *) mem); ++ print_strings (filename, NULL, sect->filepos, sectsize, (char *) mem); + free (mem); + } + +@@ -429,7 +479,7 @@ strings_file (char *file) + return FALSE; + } + +- print_strings (file, stream, (file_ptr) 0, 0, 0, (char *) 0); ++ print_strings (file, stream, (file_ptr) 0, 0, (char *) NULL); + + if (fclose (stream) == EOF) + { +@@ -553,11 +603,632 @@ unget_part_char (long c, file_ptr *addre + } + } + } ++ ++ ++static void ++print_filename_and_address (const char * filename, file_ptr address) ++{ ++ if (print_filenames) ++ printf ("%s: ", filename); ++ ++ if (! print_addresses) ++ return; ++ ++ switch (address_radix) ++ { ++ case 8: ++ if (sizeof (address) > sizeof (long)) ++ { ++#ifndef __MSVCRT__ ++ printf ("%7llo ", (unsigned long long) address); ++#else ++ printf ("%7I64o ", (unsigned long long) address); ++#endif ++ } ++ else ++ printf ("%7lo ", (unsigned long) address); ++ break; ++ ++ case 10: ++ if (sizeof (address) > sizeof (long)) ++ { ++#ifndef __MSVCRT__ ++ printf ("%7llu ", (unsigned long long) address); ++#else ++ printf ("%7I64d ", (unsigned long long) address); ++#endif ++ } ++ else ++ printf ("%7ld ", (long) address); ++ break; ++ ++ case 16: ++ if (sizeof (address) > sizeof (long)) ++ { ++#ifndef __MSVCRT__ ++ printf ("%7llx ", (unsigned long long) address); ++#else ++ printf ("%7I64x ", (unsigned long long) address); ++#endif ++ } ++ else ++ printf ("%7lx ", (unsigned long) address); ++ break; ++ } ++} ++ ++/* Return non-zero if the bytes starting at BUFFER form a valid UTF-8 encoding. ++ If the encoding is valid then returns the number of bytes it uses. */ ++ ++static unsigned int ++is_valid_utf8 (const unsigned char * buffer, unsigned long buflen) ++{ ++ if (buffer[0] < 0xc0) ++ return 0; ++ ++ if (buflen < 2) ++ return 0; ++ ++ if ((buffer[1] & 0xc0) != 0x80) ++ return 0; ++ ++ if ((buffer[0] & 0x20) == 0) ++ return 2; ++ ++ if (buflen < 3) ++ return 0; ++ ++ if ((buffer[2] & 0xc0) != 0x80) ++ return 0; ++ ++ if ((buffer[0] & 0x10) == 0) ++ return 3; ++ ++ if (buflen < 4) ++ return 0; ++ ++ if ((buffer[3] & 0xc0) != 0x80) ++ return 0; ++ ++ return 4; ++} ++ ++/* Display a UTF-8 encoded character in BUFFER according to the setting ++ of unicode_display. The character is known to be valid. ++ Returns the number of bytes consumed. */ ++ ++static unsigned int ++display_utf8_char (const unsigned char * buffer) ++{ ++ unsigned int j; ++ unsigned int utf8_len; ++ ++ switch (buffer[0] & 0x30) ++ { ++ case 0x00: ++ case 0x10: ++ utf8_len = 2; ++ break; ++ case 0x20: ++ utf8_len = 3; ++ break; ++ default: ++ utf8_len = 4; ++ } ++ ++ switch (unicode_display) ++ { ++ default: ++ fprintf (stderr, "ICE: unexpected unicode display type\n"); ++ break; ++ ++ case unicode_escape: ++ case unicode_highlight: ++ if (unicode_display == unicode_highlight && isatty (1)) ++ printf ("\x1B[31;47m"); /* Red. */ ++ ++ switch (utf8_len) ++ { ++ case 2: ++ printf ("\\u%02x%02x", ++ ((buffer[0] & 0x1c) >> 2), ++ ((buffer[0] & 0x03) << 6) | (buffer[1] & 0x3f)); ++ break; ++ ++ case 3: ++ printf ("\\u%02x%02x", ++ ((buffer[0] & 0x0f) << 4) | ((buffer[1] & 0x3c) >> 2), ++ ((buffer[1] & 0x03) << 6) | ((buffer[2] & 0x3f))); ++ break; ++ ++ case 4: ++ printf ("\\u%02x%02x%02x", ++ ((buffer[0] & 0x07) << 6) | ((buffer[1] & 0x3c) >> 2), ++ ((buffer[1] & 0x03) << 6) | ((buffer[2] & 0x3c) >> 2), ++ ((buffer[2] & 0x03) << 6) | ((buffer[3] & 0x3f))); ++ break; ++ default: ++ /* URG. */ ++ break; ++ } ++ ++ if (unicode_display == unicode_highlight && isatty (1)) ++ printf ("\033[0m"); /* Default colour. */ ++ break; ++ ++ case unicode_hex: ++ putchar ('<'); ++ printf ("0x"); ++ for (j = 0; j < utf8_len; j++) ++ printf ("%02x", buffer [j]); ++ putchar ('>'); ++ break; ++ ++ case unicode_locale: ++ printf ("%.1s", buffer); ++ break; ++ } ++ ++ return utf8_len; ++} ++ ++/* Display strings in BUFFER. Treat any UTF-8 encoded characters encountered ++ according to the setting of the unicode_display variable. The buffer ++ contains BUFLEN bytes. ++ ++ Display the characters as if they started at ADDRESS and are contained in ++ FILENAME. */ ++ ++static void ++print_unicode_buffer (const char * filename, ++ file_ptr address, ++ const unsigned char * buffer, ++ unsigned long buflen) ++{ ++ /* Paranoia checks... */ ++ if (filename == NULL ++ || buffer == NULL ++ || unicode_display == unicode_default ++ || encoding != 'S' ++ || encoding_bytes != 1) ++ { ++ fprintf (stderr, "ICE: bad arguments to print_unicode_buffer\n"); ++ return; ++ } ++ ++ if (buflen == 0) ++ return; ++ ++ /* We must only display strings that are at least string_min *characters* ++ long. So we scan the buffer in two stages. First we locate the start ++ of a potential string. Then we walk along it until we have found ++ string_min characters. Then we go back to the start point and start ++ displaying characters according to the unicode_display setting. */ ++ ++ unsigned long start_point = 0; ++ unsigned long i = 0; ++ unsigned int char_len = 1; ++ unsigned int num_found = 0; ++ ++ for (i = 0; i < buflen; i += char_len) ++ { ++ int c = buffer[i]; ++ ++ char_len = 1; ++ ++ /* Find the first potential character of a string. */ ++ if (! STRING_ISGRAPHIC (c)) ++ { ++ num_found = 0; ++ continue; ++ } ++ ++ if (c > 126) ++ { ++ if (c < 0xc0) ++ { ++ num_found = 0; ++ continue; ++ } ++ ++ if ((char_len = is_valid_utf8 (buffer + i, buflen - i)) == 0) ++ { ++ char_len = 1; ++ num_found = 0; ++ continue; ++ } ++ ++ if (unicode_display == unicode_invalid) ++ { ++ /* We have found a valid UTF-8 character, but we treat it as non-graphic. */ ++ num_found = 0; ++ continue; ++ } ++ } ++ ++ if (num_found == 0) ++ /* We have found a potential starting point for a string. */ ++ start_point = i; ++ ++ ++ num_found; ++ ++ if (num_found >= string_min) ++ break; ++ } ++ ++ if (num_found < string_min) ++ return; ++ ++ print_filename_and_address (filename, address + start_point); ++ ++ /* We have found string_min characters. Display them and any ++ more that follow. */ ++ for (i = start_point; i < buflen; i += char_len) ++ { ++ int c = buffer[i]; ++ ++ char_len = 1; ++ ++ if (! STRING_ISGRAPHIC (c)) ++ break; ++ else if (c < 127) ++ putchar (c); ++ else if (! is_valid_utf8 (buffer + i, buflen - i)) ++ break; ++ else if (unicode_display == unicode_invalid) ++ break; ++ else ++ char_len = display_utf8_char (buffer + i); ++ } ++ ++ if (output_separator) ++ fputs (output_separator, stdout); ++ else ++ putchar ('\n'); ++ ++ /* FIXME: Using tail recursion here is lazy programming... */ ++ print_unicode_buffer (filename, address + i, buffer + i, buflen - i); ++} ++ ++static int ++get_unicode_byte (FILE * stream, ++ unsigned char * putback, ++ unsigned int * num_putback, ++ unsigned int * num_read) ++{ ++ if (* num_putback > 0) ++ { ++ * num_putback = * num_putback - 1; ++ return putback [* num_putback]; ++ } ++ ++ * num_read = * num_read + 1; ++ ++#if defined(HAVE_GETC_UNLOCKED) && HAVE_DECL_GETC_UNLOCKED ++ return getc_unlocked (stream); ++#else ++ return getc (stream); ++#endif ++} ++ ++/* Helper function for print_unicode_stream. */ ++ ++static void ++print_unicode_stream_body (const char * filename, ++ file_ptr address, ++ FILE * stream, ++ unsigned char * putback_buf, ++ unsigned int num_putback, ++ unsigned char * print_buf) ++{ ++ /* It would be nice if we could just read the stream into a buffer ++ and then process if with print_unicode_buffer. But the input ++ might be huge or it might time-locked (eg stdin). So instead ++ we go one byte at a time... */ ++ ++ file_ptr start_point = 0; ++ unsigned int num_read = 0; ++ unsigned int num_chars = 0; ++ unsigned int num_print = 0; ++ int c; ++ ++ /* Find a series of string_min characters. Put them into print_buf. */ ++ do ++ { ++ if (num_chars >= string_min) ++ break; ++ ++ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read); ++ if (c == EOF) ++ break; ++ ++ if (! STRING_ISGRAPHIC (c)) ++ { ++ num_chars = num_print = 0; ++ continue; ++ } ++ ++ if (num_chars == 0) ++ start_point = num_read - 1; ++ ++ if (c < 127) ++ { ++ print_buf[num_print] = c; ++ num_chars ++; ++ num_print ++; ++ continue; ++ } ++ ++ if (c < 0xc0) ++ { ++ num_chars = num_print = 0; ++ continue; ++ } ++ ++ /* We *might* have a UTF-8 sequence. Time to start peeking. */ ++ char utf8[4]; ++ ++ utf8[0] = c; ++ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read); ++ if (c == EOF) ++ break; ++ utf8[1] = c; ++ ++ if ((utf8[1] & 0xc0) != 0x80) ++ { ++ /* Invalid UTF-8. */ ++ putback_buf[num_putback++] = utf8[1]; ++ num_chars = num_print = 0; ++ continue; ++ } ++ else if ((utf8[0] & 0x20) == 0) ++ { ++ /* A valid 2-byte UTF-8 encoding. */ ++ if (unicode_display == unicode_invalid) ++ { ++ putback_buf[num_putback++] = utf8[1]; ++ num_chars = num_print = 0; ++ } ++ else ++ { ++ print_buf[num_print ++] = utf8[0]; ++ print_buf[num_print ++] = utf8[1]; ++ num_chars ++; ++ } ++ continue; ++ } ++ ++ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read); ++ if (c == EOF) ++ break; ++ utf8[2] = c; ++ ++ if ((utf8[2] & 0xc0) != 0x80) ++ { ++ /* Invalid UTF-8. */ ++ putback_buf[num_putback++] = utf8[2]; ++ putback_buf[num_putback++] = utf8[1]; ++ num_chars = num_print = 0; ++ continue; ++ } ++ else if ((utf8[0] & 0x10) == 0) ++ { ++ /* A valid 3-byte UTF-8 encoding. */ ++ if (unicode_display == unicode_invalid) ++ { ++ putback_buf[num_putback++] = utf8[2]; ++ putback_buf[num_putback++] = utf8[1]; ++ num_chars = num_print = 0; ++ } ++ else ++ { ++ print_buf[num_print ++] = utf8[0]; ++ print_buf[num_print ++] = utf8[1]; ++ print_buf[num_print ++] = utf8[2]; ++ num_chars ++; ++ } ++ continue; ++ } ++ ++ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read); ++ if (c == EOF) ++ break; ++ utf8[3] = c; ++ ++ if ((utf8[3] & 0xc0) != 0x80) ++ { ++ /* Invalid UTF-8. */ ++ putback_buf[num_putback++] = utf8[3]; ++ putback_buf[num_putback++] = utf8[2]; ++ putback_buf[num_putback++] = utf8[1]; ++ num_chars = num_print = 0; ++ } ++ /* We have a valid 4-byte UTF-8 encoding. */ ++ else if (unicode_display == unicode_invalid) ++ { ++ putback_buf[num_putback++] = utf8[3]; ++ putback_buf[num_putback++] = utf8[1]; ++ putback_buf[num_putback++] = utf8[2]; ++ num_chars = num_print = 0; ++ } ++ else ++ { ++ print_buf[num_print ++] = utf8[0]; ++ print_buf[num_print ++] = utf8[1]; ++ print_buf[num_print ++] = utf8[2]; ++ print_buf[num_print ++] = utf8[3]; ++ num_chars ++; ++ } ++ } ++ while (1); ++ ++ if (num_chars >= string_min) ++ { ++ /* We know that we have string_min valid characters in print_buf, ++ and there may be more to come in the stream. Start displaying ++ them. */ ++ ++ print_filename_and_address (filename, address + start_point); ++ ++ unsigned int i; ++ for (i = 0; i < num_print;) ++ { ++ if (print_buf[i] < 127) ++ putchar (print_buf[i++]); ++ else ++ i += display_utf8_char (print_buf + i); ++ } ++ ++ /* OK so now we have to start read unchecked bytes. */ ++ ++ /* Find a series of string_min characters. Put them into print_buf. */ ++ do ++ { ++ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read); ++ if (c == EOF) ++ break; ++ ++ if (! STRING_ISGRAPHIC (c)) ++ break; ++ ++ if (c < 127) ++ { ++ putchar (c); ++ continue; ++ } ++ ++ if (c < 0xc0) ++ break; ++ ++ /* We *might* have a UTF-8 sequence. Time to start peeking. */ ++ unsigned char utf8[4]; ++ ++ utf8[0] = c; ++ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read); ++ if (c == EOF) ++ break; ++ utf8[1] = c; ++ ++ if ((utf8[1] & 0xc0) != 0x80) ++ { ++ /* Invalid UTF-8. */ ++ putback_buf[num_putback++] = utf8[1]; ++ break; ++ } ++ else if ((utf8[0] & 0x20) == 0) ++ { ++ /* Valid 2-byte UTF-8. */ ++ if (unicode_display == unicode_invalid) ++ { ++ putback_buf[num_putback++] = utf8[1]; ++ break; ++ } ++ else ++ { ++ (void) display_utf8_char (utf8); ++ continue; ++ } ++ } ++ ++ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read); ++ if (c == EOF) ++ break; ++ utf8[2] = c; ++ ++ if ((utf8[2] & 0xc0) != 0x80) ++ { ++ /* Invalid UTF-8. */ ++ putback_buf[num_putback++] = utf8[2]; ++ putback_buf[num_putback++] = utf8[1]; ++ break; ++ } ++ else if ((utf8[0] & 0x10) == 0) ++ { ++ /* Valid 3-byte UTF-8. */ ++ if (unicode_display == unicode_invalid) ++ { ++ putback_buf[num_putback++] = utf8[2]; ++ putback_buf[num_putback++] = utf8[1]; ++ break; ++ } ++ else ++ { ++ (void) display_utf8_char (utf8); ++ continue; ++ } ++ } ++ ++ c = get_unicode_byte (stream, putback_buf, & num_putback, & num_read); ++ if (c == EOF) ++ break; ++ utf8[3] = c; ++ ++ if ((utf8[3] & 0xc0) != 0x80) ++ { ++ /* Invalid UTF-8. */ ++ putback_buf[num_putback++] = utf8[3]; ++ putback_buf[num_putback++] = utf8[2]; ++ putback_buf[num_putback++] = utf8[1]; ++ break; ++ } ++ else if (unicode_display == unicode_invalid) ++ { ++ putback_buf[num_putback++] = utf8[3]; ++ putback_buf[num_putback++] = utf8[2]; ++ putback_buf[num_putback++] = utf8[1]; ++ break; ++ } ++ else ++ /* A valid 4-byte UTF-8 encoding. */ ++ (void) display_utf8_char (utf8); ++ } ++ while (1); ++ ++ if (output_separator) ++ fputs (output_separator, stdout); ++ else ++ putchar ('\n'); ++ } ++ ++ if (c != EOF) ++ /* FIXME: Using tail recursion here is lazy, but it works. */ ++ print_unicode_stream_body (filename, address + num_read, stream, putback_buf, num_putback, print_buf); ++} ++ ++/* Display strings read in from STREAM. Treat any UTF-8 encoded characters ++ encountered according to the setting of the unicode_display variable. ++ The stream is positioned at ADDRESS and is attached to FILENAME. */ ++ ++static void ++print_unicode_stream (const char * filename, ++ file_ptr address, ++ FILE * stream) ++{ ++ /* Paranoia checks... */ ++ if (filename == NULL ++ || stream == NULL ++ || unicode_display == unicode_default ++ || encoding != 'S' ++ || encoding_bytes != 1) ++ { ++ fprintf (stderr, "ICE: bad arguments to print_unicode_stream\n"); ++ return; ++ } ++ ++ /* Allocate space for string_min 4-byte utf-8 characters. */ ++ unsigned char * print_buf = xmalloc ((4 * string_min) + 1); ++ /* We should never have to put back more than 4 bytes. */ ++ unsigned char putback_buf[5]; ++ unsigned int num_putback = 0; ++ ++ print_unicode_stream_body (filename, address, stream, putback_buf, num_putback, print_buf); ++ free (print_buf); ++} ++ + + /* Find the strings in file FILENAME, read from STREAM. + Assume that STREAM is positioned so that the next byte read + is at address ADDRESS in the file. +- Stop reading at address STOP_POINT in the file, if nonzero. + + If STREAM is NULL, do not read from it. + The caller can supply a buffer of characters +@@ -568,20 +1239,29 @@ unget_part_char (long c, file_ptr *addre + + static void + print_strings (const char *filename, FILE *stream, file_ptr address, +- int stop_point, int magiccount, char *magic) ++ int magiccount, char *magic) + { ++ if (unicode_display != unicode_default) ++ { ++ if (magic != NULL) ++ print_unicode_buffer (filename, address, ++ (const unsigned char *) magic, magiccount); ++ ++ if (stream != NULL) ++ print_unicode_stream (filename, address, stream); ++ return; ++ } ++ + char *buf = (char *) xmalloc (sizeof (char) * (string_min + 1)); + + while (1) + { + file_ptr start; +- int i; ++ unsigned int i; + long c; + + /* See if the next `string_min' chars are all graphic chars. */ + tryline: +- if (stop_point && address >= stop_point) +- break; + start = address; + for (i = 0; i < string_min; i++) + { +@@ -604,69 +1284,7 @@ print_strings (const char *filename, FIL + /* We found a run of `string_min' graphic characters. Print up + to the next non-graphic character. */ + +- if (print_filenames) +- printf ("%s: ", filename); +- if (print_addresses) +- switch (address_radix) +- { +- case 8: +-#ifdef HAVE_LONG_LONG +- if (sizeof (start) > sizeof (long)) +- { +-# ifndef __MSVCRT__ +- printf ("%7llo ", (unsigned long long) start); +-# else +- printf ("%7I64o ", (unsigned long long) start); +-# endif +- } +- else +-#elif !BFD_HOST_64BIT_LONG +- if (start != (unsigned long) start) +- printf ("++%7lo ", (unsigned long) start); +- else +-#endif +- printf ("%7lo ", (unsigned long) start); +- break; +- +- case 10: +-#ifdef HAVE_LONG_LONG +- if (sizeof (start) > sizeof (long)) +- { +-# ifndef __MSVCRT__ +- printf ("%7llu ", (unsigned long long) start); +-# else +- printf ("%7I64d ", (unsigned long long) start); +-# endif +- } +- else +-#elif !BFD_HOST_64BIT_LONG +- if (start != (unsigned long) start) +- printf ("++%7lu ", (unsigned long) start); +- else +-#endif +- printf ("%7ld ", (long) start); +- break; +- +- case 16: +-#ifdef HAVE_LONG_LONG +- if (sizeof (start) > sizeof (long)) +- { +-# ifndef __MSVCRT__ +- printf ("%7llx ", (unsigned long long) start); +-# else +- printf ("%7I64x ", (unsigned long long) start); +-# endif +- } +- else +-#elif !BFD_HOST_64BIT_LONG +- if (start != (unsigned long) start) +- printf ("%lx%8.8lx ", (unsigned long) (start >> 32), +- (unsigned long) (start & 0xffffffff)); +- else +-#endif +- printf ("%7lx ", (unsigned long) start); +- break; +- } ++ print_filename_and_address (filename, start); + + buf[i] = '\0'; + fputs (buf, stdout); +@@ -718,6 +1336,8 @@ usage (FILE *stream, int status) + -T --target= Specify the binary file format\n\ + -e --encoding={s,S,b,l,B,L} Select character size and endianness:\n\ + s = 7-bit, S = 8-bit, {b,l} = 16-bit, {B,L} = 32-bit\n\ ++ --unicode={default|show|invalid|hex|escape|highlight}\n\ ++ -u {d|s|i|x|e|h} Specify how to treat UTF-8 encoded unicode characters\n\ + -s --output-separator= String used to separate strings in output.\n\ + @ Read options from \n\ + -h --help Display this information\n\ From patchwork Wed Jan 5 15:18:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2064 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 083CBC433FE for ; Wed, 5 Jan 2022 15:19:05 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:04 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ZUZ+WcWc; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395944; x=1672931944; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=iQCEWkwKMuV59Gq0erBp6B9QgXkDGgOAl7YTeCnvinU=; b=ZUZ+WcWciru7nXsf7yNxz6601J1CtqeaVRh3MX2kHnZPy9DsZE1pEU3/ 2E1MjpLt4b9uwOUg9zxx3vYNvluiS9wOIalABngVX/l0M945Cuh91qT+I IYQgd519YlMcOCJnRnB/VIGxi3R5rbtv8BoInhqCWBF40X5u7q0JT/MLJ hagIjUPm/K4w0yq/sWS17E5giXKq7mEJojzSnkSO5a9BNcRmb8krjEYE0 hkM0IhQvY3rFsl+ww99M9imw8NbB77tkqYhwACExnXwCu4MWPmGja1j1g nbkKQl5XmhGXeARWbK4EdELx+GlQ6w9S3R4GE3zuuYohJQ3uRvhhLBXex A==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742746" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742746" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:04 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128567" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:03 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 03/24] python3-pyelftools: Depend on debugger, pprint Date: Wed, 5 Jan 2022 23:18:23 +0800 Message-Id: <66211faf4724b2c88eb4595e41fe98f5da96c3ee.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160188 From: Chaitanya Vadrevu python3-pyelftools uses python3-debugger, python3-pprint. So add dependencies on these packages. Signed-off-by: Chaitanya Vadrevu Signed-off-by: Richard Purdie (cherry picked from commit 22e84cdd05870f1a19c6389b66c4dfd5e9b418f7) Signed-off-by: Anuj Mittal --- meta/recipes-devtools/python/python3-pyelftools_0.27.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/python/python3-pyelftools_0.27.bb b/meta/recipes-devtools/python/python3-pyelftools_0.27.bb index 0cfd99504b..e2d0e18277 100644 --- a/meta/recipes-devtools/python/python3-pyelftools_0.27.bb +++ b/meta/recipes-devtools/python/python3-pyelftools_0.27.bb @@ -11,3 +11,5 @@ PYPI_PACKAGE = "pyelftools" inherit pypi setuptools3 BBCLASSEXTEND = "native" + +RDEPENDS:${PN} += "${PYTHON_PN}-debugger ${PYTHON_PN}-pprint" From patchwork Wed Jan 5 15:18:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2067 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 EE8BCC433F5 for ; Wed, 5 Jan 2022 15:19:06 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:06 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=FFx+5aWm; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395946; x=1672931946; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=ZjxQPmTmPsroLshVLWE/kalhir5xp1yYNwtE3P1Xis8=; b=FFx+5aWmCkYWcqO7pyjUD3eNieDxWrbKp8hqgFpCwFuirPm8aRkncuIe Hx4iwclFbOdakeaazMQBrhbAV55Up5MPoByH0kEzW7/hUXoktWJvFM9WT 7A2bnb7ij2I/vK9400YmjWRBnyqM9pUEGLMY085xtL2ZAw7tQdijlgaya E1r/YIUhqorhMTrhnpqkNFpTDS0qHVXQ+xybFXug9D8T1ee2maLJ8nECe EQShUT/sp+sX7SZWNi6bR8Q1qoO374IX7kUqPN/uWvzr0IfJeSl9s3MZI 6S2Zvn9GjJ51YK451Re5s52c0CBjtu2d+iohYrt9pQFfpA+eEA11tjBU6 A==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742757" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742757" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:05 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128577" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:04 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 04/24] vim: upgrade to 8.2 patch 3752 Date: Wed, 5 Jan 2022 23:18:24 +0800 Message-Id: X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:06 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160189 From: Ross Burton There's a fairly constant flow of CVEs being fixed in Vim, which are getting increasing non-trivial to backport. Instead of trying to backport (and potentially introduce more bugs), or just ignoring them entirely, upgrade vim to the latest patch. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 78a4796de27d710f97c336d288d797557a58694e) Signed-off-by: Mingli Yu Signed-off-by: Anuj Mittal --- ...src-Makefile-improve-reproducibility.patch | 13 +- .../vim/files/CVE-2021-3778.patch | 34 --- .../vim/files/CVE-2021-3872.patch | 57 ----- ...1e135a16091c93f6f5f7525a5c58fb7ca9f9.patch | 207 ------------------ .../vim/files/disable_acl_header_check.patch | 15 +- .../vim/files/no-path-adjust.patch | 8 +- meta/recipes-support/vim/files/racefix.patch | 6 +- ...m-add-knob-whether-elf.h-are-checked.patch | 13 +- meta/recipes-support/vim/vim.inc | 14 +- 9 files changed, 28 insertions(+), 339 deletions(-) delete mode 100644 meta/recipes-support/vim/files/CVE-2021-3778.patch delete mode 100644 meta/recipes-support/vim/files/CVE-2021-3872.patch delete mode 100644 meta/recipes-support/vim/files/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch diff --git a/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch b/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch index 63a7b78f12..2fc11dbdc2 100644 --- a/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch +++ b/meta/recipes-support/vim/files/0001-src-Makefile-improve-reproducibility.patch @@ -16,11 +16,11 @@ Signed-off-by: Mingli Yu src/Makefile | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) -diff --git a/src/Makefile b/src/Makefile -index f2fafa4dc..7148d4bd9 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -2845,16 +2845,10 @@ auto/pathdef.c: Makefile auto/config.mk +Index: git/src/Makefile +=================================================================== +--- git.orig/src/Makefile ++++ git/src/Makefile +@@ -3101,16 +3101,10 @@ auto/pathdef.c: Makefile auto/config.mk -@echo '#include "vim.h"' >> $@ -@echo 'char_u *default_vim_dir = (char_u *)"$(VIMRCLOC)";' | $(QUOTESED) >> $@ -@echo 'char_u *default_vimruntime_dir = (char_u *)"$(VIMRUNTIMEDIR)";' | $(QUOTESED) >> $@ @@ -41,6 +41,3 @@ index f2fafa4dc..7148d4bd9 100644 -@sh $(srcdir)/pathdef.sh GUI_GTK_RES_INPUTS = \ --- -2.17.1 - diff --git a/meta/recipes-support/vim/files/CVE-2021-3778.patch b/meta/recipes-support/vim/files/CVE-2021-3778.patch deleted file mode 100644 index 04ac413e56..0000000000 --- a/meta/recipes-support/vim/files/CVE-2021-3778.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9ba62f1042513fcadcc4e8fdcee171db66ef1d69 Mon Sep 17 00:00:00 2001 -From: Bram Moolenaar -Date: Fri, 24 Sep 2021 15:15:24 +0800 -Subject: [PATCH] patch 8.2.3409: reading beyond end of line with invalid utf-8 - character - -Problem: Reading beyond end of line with invalid utf-8 character. -Solution: Check for NUL when advancing. - -Upstream-Status: Backport [https://github.com/vim/vim/commit/65b605665997fad54ef39a93199e305af2fe4d7f] -CVE: CVE-2021-3778 - -Signed-off-by: Mingli Yu ---- - src/regexp_nfa.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/regexp_nfa.c b/src/regexp_nfa.c -index fb512f961..2806408de 100644 ---- a/src/regexp_nfa.c -+++ b/src/regexp_nfa.c -@@ -5455,7 +5455,8 @@ find_match_text(colnr_T startcol, int regstart, char_u *match_text) - match = FALSE; - break; - } -- len2 += MB_CHAR2LEN(c2); -+ len2 += enc_utf8 ? utf_ptr2len(rex.line + col + len2) -+ : MB_CHAR2LEN(c2); - } - if (match - // check that no composing char follows --- -2.17.1 - diff --git a/meta/recipes-support/vim/files/CVE-2021-3872.patch b/meta/recipes-support/vim/files/CVE-2021-3872.patch deleted file mode 100644 index f0f30933fa..0000000000 --- a/meta/recipes-support/vim/files/CVE-2021-3872.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 132d060ffbb9651f0d79bd0b6d80cab460235a99 Mon Sep 17 00:00:00 2001 -From: Bram Moolenaar -Date: Fri, 12 Nov 2021 02:56:51 +0000 -Subject: [PATCH] patch 8.2.3487: illegal memory access if buffer name is very - long - -Problem: Illegal memory access if buffer name is very long. -Solution: Make sure not to go over the end of the buffer. - -CVE: CVE-2021-3872 - -Upstream-Status: Backport [https://github.com/vim/vim/commit/826bfe4bbd7594188e3d74d2539d9707b1c6a14b] - -Signed-off-by: Mingli Yu ---- - src/drawscreen.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/src/drawscreen.c b/src/drawscreen.c -index 3a88ee979..9acb70552 100644 ---- a/src/drawscreen.c -+++ b/src/drawscreen.c -@@ -446,13 +446,13 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED) - *(p + len++) = ' '; - if (bt_help(wp->w_buffer)) - { -- STRCPY(p + len, _("[Help]")); -+ vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[Help]")); - len += (int)STRLEN(p + len); - } - #ifdef FEAT_QUICKFIX - if (wp->w_p_pvw) - { -- STRCPY(p + len, _("[Preview]")); -+ vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[Preview]")); - len += (int)STRLEN(p + len); - } - #endif -@@ -462,12 +462,12 @@ win_redr_status(win_T *wp, int ignore_pum UNUSED) - #endif - ) - { -- STRCPY(p + len, "[+]"); -- len += 3; -+ vim_snprintf((char *)p + len, MAXPATHL - len, "%s", "[+]"); -+ len += (int)STRLEN(p + len); - } - if (wp->w_buffer->b_p_ro) - { -- STRCPY(p + len, _("[RO]")); -+ vim_snprintf((char *)p + len, MAXPATHL - len, "%s", _("[RO]")); - len += (int)STRLEN(p + len); - } - --- -2.31.1 - diff --git a/meta/recipes-support/vim/files/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch b/meta/recipes-support/vim/files/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch deleted file mode 100644 index 1cee759502..0000000000 --- a/meta/recipes-support/vim/files/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch +++ /dev/null @@ -1,207 +0,0 @@ -From b7081e135a16091c93f6f5f7525a5c58fb7ca9f9 Mon Sep 17 00:00:00 2001 -From: Bram Moolenaar -Date: Sat, 4 Sep 2021 18:47:28 +0200 -Subject: [PATCH] patch 8.2.3402: invalid memory access when using :retab with - large value - -Problem: Invalid memory access when using :retab with large value. -Solution: Check the number is positive. - -CVE: CVE-2021-3770 -Signed-off-by: Richard Purdie -Upstream-Status: Backport [https://github.com/vim/vim/commit/b7081e135a16091c93f6f5f7525a5c58fb7ca9f9] ---- - src/indent.c | 34 +++++++++++++++++++++------------- - src/option.c | 12 ++++++------ - src/optionstr.c | 4 ++-- - src/testdir/test_retab.vim | 3 +++ - src/version.c | 2 ++ - 5 files changed, 34 insertions(+), 21 deletions(-) - -Index: git/src/indent.c -=================================================================== ---- git.orig/src/indent.c -+++ git/src/indent.c -@@ -18,18 +18,19 @@ - /* - * Set the integer values corresponding to the string setting of 'vartabstop'. - * "array" will be set, caller must free it if needed. -+ * Return FAIL for an error. - */ - int - tabstop_set(char_u *var, int **array) - { -- int valcount = 1; -- int t; -- char_u *cp; -+ int valcount = 1; -+ int t; -+ char_u *cp; - - if (var[0] == NUL || (var[0] == '0' && var[1] == NUL)) - { - *array = NULL; -- return TRUE; -+ return OK; - } - - for (cp = var; *cp != NUL; ++cp) -@@ -43,8 +44,8 @@ tabstop_set(char_u *var, int **array) - if (cp != end) - emsg(_(e_positive)); - else -- emsg(_(e_invarg)); -- return FALSE; -+ semsg(_(e_invarg2), cp); -+ return FAIL; - } - } - -@@ -55,26 +56,33 @@ tabstop_set(char_u *var, int **array) - ++valcount; - continue; - } -- emsg(_(e_invarg)); -- return FALSE; -+ semsg(_(e_invarg2), var); -+ return FAIL; - } - - *array = ALLOC_MULT(int, valcount + 1); - if (*array == NULL) -- return FALSE; -+ return FAIL; - (*array)[0] = valcount; - - t = 1; - for (cp = var; *cp != NUL;) - { -- (*array)[t++] = atoi((char *)cp); -- while (*cp != NUL && *cp != ',') -+ int n = atoi((char *)cp); -+ -+ if (n < 0 || n > 9999) -+ { -+ semsg(_(e_invarg2), cp); -+ return FAIL; -+ } -+ (*array)[t++] = n; -+ while (*cp != NUL && *cp != ',') - ++cp; - if (*cp != NUL) - ++cp; - } - -- return TRUE; -+ return OK; - } - - /* -@@ -1556,7 +1564,7 @@ ex_retab(exarg_T *eap) - - #ifdef FEAT_VARTABS - new_ts_str = eap->arg; -- if (!tabstop_set(eap->arg, &new_vts_array)) -+ if (tabstop_set(eap->arg, &new_vts_array) == FAIL) - return; - while (vim_isdigit(*(eap->arg)) || *(eap->arg) == ',') - ++(eap->arg); -Index: git/src/option.c -=================================================================== ---- git.orig/src/option.c -+++ git/src/option.c -@@ -2292,9 +2292,9 @@ didset_options2(void) - #endif - #ifdef FEAT_VARTABS - vim_free(curbuf->b_p_vsts_array); -- tabstop_set(curbuf->b_p_vsts, &curbuf->b_p_vsts_array); -+ (void)tabstop_set(curbuf->b_p_vsts, &curbuf->b_p_vsts_array); - vim_free(curbuf->b_p_vts_array); -- tabstop_set(curbuf->b_p_vts, &curbuf->b_p_vts_array); -+ (void)tabstop_set(curbuf->b_p_vts, &curbuf->b_p_vts_array); - #endif - } - -@@ -5756,7 +5756,7 @@ buf_copy_options(buf_T *buf, int flags) - buf->b_p_vsts = vim_strsave(p_vsts); - COPY_OPT_SCTX(buf, BV_VSTS); - if (p_vsts && p_vsts != empty_option) -- tabstop_set(p_vsts, &buf->b_p_vsts_array); -+ (void)tabstop_set(p_vsts, &buf->b_p_vsts_array); - else - buf->b_p_vsts_array = 0; - buf->b_p_vsts_nopaste = p_vsts_nopaste -@@ -5914,7 +5914,7 @@ buf_copy_options(buf_T *buf, int flags) - buf->b_p_isk = save_p_isk; - #ifdef FEAT_VARTABS - if (p_vts && p_vts != empty_option && !buf->b_p_vts_array) -- tabstop_set(p_vts, &buf->b_p_vts_array); -+ (void)tabstop_set(p_vts, &buf->b_p_vts_array); - else - buf->b_p_vts_array = NULL; - #endif -@@ -5929,7 +5929,7 @@ buf_copy_options(buf_T *buf, int flags) - buf->b_p_vts = vim_strsave(p_vts); - COPY_OPT_SCTX(buf, BV_VTS); - if (p_vts && p_vts != empty_option && !buf->b_p_vts_array) -- tabstop_set(p_vts, &buf->b_p_vts_array); -+ (void)tabstop_set(p_vts, &buf->b_p_vts_array); - else - buf->b_p_vts_array = NULL; - #endif -@@ -6634,7 +6634,7 @@ paste_option_changed(void) - if (buf->b_p_vsts_array) - vim_free(buf->b_p_vsts_array); - if (buf->b_p_vsts && buf->b_p_vsts != empty_option) -- tabstop_set(buf->b_p_vsts, &buf->b_p_vsts_array); -+ (void)tabstop_set(buf->b_p_vsts, &buf->b_p_vsts_array); - else - buf->b_p_vsts_array = 0; - #endif -Index: git/src/optionstr.c -=================================================================== ---- git.orig/src/optionstr.c -+++ git/src/optionstr.c -@@ -2166,7 +2166,7 @@ did_set_string_option( - if (errmsg == NULL) - { - int *oldarray = curbuf->b_p_vsts_array; -- if (tabstop_set(*varp, &(curbuf->b_p_vsts_array))) -+ if (tabstop_set(*varp, &(curbuf->b_p_vsts_array)) == OK) - { - if (oldarray) - vim_free(oldarray); -@@ -2205,7 +2205,7 @@ did_set_string_option( - { - int *oldarray = curbuf->b_p_vts_array; - -- if (tabstop_set(*varp, &(curbuf->b_p_vts_array))) -+ if (tabstop_set(*varp, &(curbuf->b_p_vts_array)) == OK) - { - vim_free(oldarray); - #ifdef FEAT_FOLDING -Index: git/src/testdir/test_retab.vim -=================================================================== ---- git.orig/src/testdir/test_retab.vim -+++ git/src/testdir/test_retab.vim -@@ -74,4 +74,7 @@ endfunc - func Test_retab_error() - call assert_fails('retab -1', 'E487:') - call assert_fails('retab! -1', 'E487:') -+ call assert_fails('ret -1000', 'E487:') -+ call assert_fails('ret 10000', 'E475:') -+ call assert_fails('ret 80000000000000000000', 'E475:') - endfunc -Index: git/src/version.c -=================================================================== ---- git.orig/src/version.c -+++ git/src/version.c -@@ -743,6 +743,8 @@ static char *(features[]) = - static int included_patches[] = - { /* Add new patch number below this line */ - /**/ -+ 3402, -+/**/ - 0 - }; - diff --git a/meta/recipes-support/vim/files/disable_acl_header_check.patch b/meta/recipes-support/vim/files/disable_acl_header_check.patch index 33089162b4..533138245d 100644 --- a/meta/recipes-support/vim/files/disable_acl_header_check.patch +++ b/meta/recipes-support/vim/files/disable_acl_header_check.patch @@ -13,11 +13,11 @@ Signed-off-by: Changqing Li src/configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -diff --git a/src/configure.ac b/src/configure.ac -index 2d409b3ca06a..dbcaf6140263 100644 ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -3257,7 +3257,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h string.h \ +Index: git/src/configure.ac +=================================================================== +--- git.orig/src/configure.ac ++++ git/src/configure.ac +@@ -3292,7 +3292,7 @@ AC_CHECK_HEADERS(stdint.h stdlib.h strin sys/systeminfo.h locale.h sys/stream.h termios.h \ libc.h sys/statfs.h poll.h sys/poll.h pwd.h \ utime.h sys/param.h sys/ptms.h libintl.h libgen.h \ @@ -26,7 +26,7 @@ index 2d409b3ca06a..dbcaf6140263 100644 sys/access.h sys/sysinfo.h wchar.h wctype.h) dnl sys/ptem.h depends on sys/stream.h on Solaris -@@ -3886,6 +3886,7 @@ AC_ARG_ENABLE(acl, +@@ -3974,6 +3974,7 @@ AC_ARG_ENABLE(acl, , [enable_acl="yes"]) if test "$enable_acl" = "yes"; then AC_MSG_RESULT(no) @@ -34,6 +34,3 @@ index 2d409b3ca06a..dbcaf6140263 100644 AC_CHECK_LIB(posix1e, acl_get_file, [LIBS="$LIBS -lposix1e"], AC_CHECK_LIB(acl, acl_get_file, [LIBS="$LIBS -lacl" AC_CHECK_LIB(attr, fgetxattr, LIBS="$LIBS -lattr",,)],,),) --- -2.7.4 - diff --git a/meta/recipes-support/vim/files/no-path-adjust.patch b/meta/recipes-support/vim/files/no-path-adjust.patch index 05c2d803f6..9d6da80913 100644 --- a/meta/recipes-support/vim/files/no-path-adjust.patch +++ b/meta/recipes-support/vim/files/no-path-adjust.patch @@ -7,9 +7,11 @@ Upstream-Status: Pending Signed-off-by: Joe Slater ---- a/src/Makefile -+++ b/src/Makefile -@@ -2507,11 +2507,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ +Index: git/src/Makefile +=================================================================== +--- git.orig/src/Makefile ++++ git/src/Makefile +@@ -2565,11 +2565,14 @@ installtools: $(TOOLS) $(DESTDIR)$(exec_ rm -rf $$cvs; \ fi -chmod $(FILEMOD) $(DEST_TOOLS)/* diff --git a/meta/recipes-support/vim/files/racefix.patch b/meta/recipes-support/vim/files/racefix.patch index 48dca44cad..1cb8fb442f 100644 --- a/meta/recipes-support/vim/files/racefix.patch +++ b/meta/recipes-support/vim/files/racefix.patch @@ -9,9 +9,9 @@ Index: git/src/po/Makefile =================================================================== --- git.orig/src/po/Makefile +++ git/src/po/Makefile -@@ -165,17 +165,16 @@ $(PACKAGE).pot: ../*.c ../if_perl.xs ../ - po/gvim.desktop.in po/vim.desktop.in - mv -f ../$(PACKAGE).po $(PACKAGE).pot +@@ -207,17 +207,16 @@ $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM + # Delete the temporary files + rm *.js -vim.desktop: vim.desktop.in $(POFILES) +LINGUAS: diff --git a/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch b/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch index 37914d4cd9..5284ba45b6 100644 --- a/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch +++ b/meta/recipes-support/vim/files/vim-add-knob-whether-elf.h-are-checked.patch @@ -14,11 +14,11 @@ Signed-off-by: Changqing Li src/configure.ac | 7 +++++++ 1 file changed, 7 insertions(+) -diff --git a/src/configure.ac b/src/configure.ac -index 0ee86ad..64736f0 100644 ---- a/src/configure.ac -+++ b/src/configure.ac -@@ -3192,11 +3192,18 @@ AC_TRY_COMPILE([#include ], [int x __attribute__((unused));], +Index: git/src/configure.ac +=================================================================== +--- git.orig/src/configure.ac ++++ git/src/configure.ac +@@ -3264,11 +3264,18 @@ AC_TRY_COMPILE([#include ], [in AC_MSG_RESULT(no)) dnl Checks for header files. @@ -37,6 +37,3 @@ index 0ee86ad..64736f0 100644 AC_HEADER_DIRENT --- -2.7.4 - diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index 864006192b..7174d818ff 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -8,8 +8,9 @@ BUGTRACKER = "https://github.com/vim/vim/issues" DEPENDS = "ncurses gettext-native" # vimdiff doesn't like busybox diff RSUGGESTS_${PN} = "diffutils" + LICENSE = "vim" -LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=a19edd7ec70d573a005d9e509375a99a" +LIC_FILES_CHKSUM = "file://runtime/doc/uganda.txt;endline=287;md5=909f1394892b7e0f9c2a95306c0c552b" SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://disable_acl_header_check.patch \ @@ -17,17 +18,10 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://0001-src-Makefile-improve-reproducibility.patch \ file://no-path-adjust.patch \ file://racefix.patch \ - file://CVE-2021-3778.patch \ - file://CVE-2021-3796.patch \ - file://b7081e135a16091c93f6f5f7525a5c58fb7ca9f9.patch \ - file://CVE-2021-3903.patch \ - file://CVE-2021-3872.patch \ - file://CVE-2021-3875.patch \ - file://CVE-2021-3927.patch \ - file://CVE-2021-3928.patch \ " -SRCREV = "98056533b96b6b5d8849641de93185dd7bcadc44" +PV .= ".3752" +SRCREV = "8603be338ac810446f23c092f21bc6082f787519" # Do not consider .z in x.y.z, as that is updated with every commit UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+)\.0" From patchwork Wed Jan 5 15:18:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2066 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 06426C433EF for ; Wed, 5 Jan 2022 15:19:09 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:08 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=eAC5xqnz; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395947; x=1672931947; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=ZPK96jKi3j3uQPomNy+dnCBTxAjgWVXbMMMHP52tNUU=; b=eAC5xqnz6IBvuJ4voImHH4Fa1lASNK2AQY3vCzAzgDm3OMr84ba+DqDk 2AJIfFlx1AAQxbGsVuTHks1rKs9v1RcsYJjktzlg9qyqgfPchkVfU1HOk vwRGrpaEctuvMLHxcW/dpVifB+IzHbSdDNrX5aGEVJ0HYWNs9FiR9eoq9 kcSz5zsRPbiO/4vNAOmCdTbWq2lWjmYBwJTrHK28Fuj7mkfXWU3P4hUQp DC/NgJoBMNZxaY1C0A+PgafezjSVIOCNMI2EgS3C98V6FHP3s7uGI8dfB /w/WsXc5nTmGKbBS6mWe29QqRvADXHpHW5Kpheq2gcoxRAaRkmWkjgfuA Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742761" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742761" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:07 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128581" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:06 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 05/24] oeqa/selftest/bbtests: Use YP sources mirror instead of GNU Date: Wed, 5 Jan 2022 23:18:25 +0800 Message-Id: <1b5f26c5409c69a25914aad5b4553285fbb0c3a0.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160190 From: Richard Purdie The gnu sources server has been known to disappear. Use the YP sources mirror instead. If that breaks, the autobuilder is broken anyway. This should reduce test failures from upstream network issues. Signed-off-by: Richard Purdie (cherry picked from commit a5459e42f1a6be9c08f303653cc1f73514eca9ef) Signed-off-by: Anuj Mittal (cherry picked from commit fb18fcbd2529555ab98297671e3e6f68a8fd6556) Signed-off-by: Anuj Mittal --- meta/lib/oeqa/selftest/cases/bbtests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index a8b6231d83..0a618bb9a6 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py @@ -163,7 +163,7 @@ SSTATE_DIR = \"${TOPDIR}/download-selftest\" """) self.track_for_cleanup(os.path.join(self.builddir, "download-selftest")) - data = 'SRC_URI = "${GNU_MIRROR}/aspell/aspell-${PV}.tar.gz;downloadfilename=test-aspell.tar.gz"' + data = 'SRC_URI = "https://downloads.yoctoproject.org/mirror/sources/aspell-${PV}.tar.gz;downloadfilename=test-aspell.tar.gz"' self.write_recipeinc('aspell', data) result = bitbake('-f -c fetch aspell', ignore_status=True) self.delete_recipeinc('aspell') From patchwork Wed Jan 5 15:18:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2068 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 E8373C4332F for ; Wed, 5 Jan 2022 15:19:09 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:09 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=MC1FEDS3; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395949; x=1672931949; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=bDriEtbhqwwTzE6vm3f0Rgy6iiVVED+uR0rXdSnMDws=; b=MC1FEDS3nicmqio1rjgse6xE3EAK1K5VqGqASV/5Aah5aUAGoTk3ervJ jeoTor9ZWL5l7AZeoocLHiAtFPefgcVCYBDBruKflQgXg/JOHgBn3WpbN nJEwJma+WMsMZTFAq88djgFFMCw3gPZW+hxxUZ+cWfH/X0MtWfYYe0JGo Sy+2JqALhL+8viBbmgz0cqCAW7ql1uVhQcLfLzdVHPq3xYiAgldWxd5vp BByADrvoCQGjAuS8tWGBt439YSoJZmU7m3n6XFtaFJ/+b/8oKWXiyqVPR A9kZdv9YqTFqTDjfn4yZBAXAZ8b+5CHnJ3ril3fFTpMD23/pbuaxVThHU A==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742766" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742766" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:09 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128593" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:07 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 06/24] linux-firmware: upgrade 20211027 -> 20211216 Date: Wed, 5 Jan 2022 23:18:26 +0800 Message-Id: <0e2a8cf3c4c2036db70f2c028643667daa9a3d6f.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160191 From: wangmy License-Update: version of license file updated. Signed-off-by: Wang Mingyu Signed-off-by: Richard Purdie (cherry picked from commit 07dc668ddc50de14821aff1b6850d8b4999702bd) Signed-off-by: Anuj Mittal (cherry picked from commit 5170d6e0be3775376d08bd5129686ec53661786e) Signed-off-by: Anuj Mittal --- ...{linux-firmware_20211027.bb => linux-firmware_20211216.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-kernel/linux-firmware/{linux-firmware_20211027.bb => linux-firmware_20211216.bb} (99%) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_20211027.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb similarity index 99% rename from meta/recipes-kernel/linux-firmware/linux-firmware_20211027.bb rename to meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb index 76aed9d443..92b6ff5157 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_20211027.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_20211216.bb @@ -132,7 +132,7 @@ LIC_FILES_CHKSUM = "file://LICENCE.Abilis;md5=b5ee3f410780e56711ad48eadc22b8bc \ file://LICENCE.xc4000;md5=0ff51d2dc49fce04814c9155081092f0 \ file://LICENCE.xc5000;md5=1e170c13175323c32c7f4d0998d53f66 \ file://LICENCE.xc5000c;md5=12b02efa3049db65d524aeb418dd87ca \ - file://WHENCE;md5=d627873bd934d7c52b2c8191304a8eb7 \ + file://WHENCE;md5=79f477f9d53eedee5a65b45193785963 \ " # These are not common licenses, set NO_GENERIC_LICENSE for them @@ -205,7 +205,7 @@ PE = "1" SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/firmware/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "bc2657dd8eb82386a9a7ec6df9ccf31c32c7e9073c05d37786c1edc273f9440a" +SRC_URI[sha256sum] = "eeddb4e6bef31fd1a3757f12ccc324929bbad97855c0b9ec5ed780f74de1837d" inherit allarch From patchwork Wed Jan 5 15:18:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2069 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 EDF53C433EF for ; Wed, 5 Jan 2022 15:19:11 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:11 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=S2JcGM6p; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395951; x=1672931951; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=AnKKaNr13VDf/N/7oGZ7Q5CrD2Ln64PbJJwDUkGnQUs=; b=S2JcGM6p4UQcLcbHzm/Jwbq/o4V086rjpOfv9GeOm1uVp9sKCHv2KD5v GLbznDt4JkfN5NMqqZUGcueBrTniTRWlvqDD3Fkn7w0Y4liQbMIsfFc8I hLrZKsddtpfzvbZ4rH8IcinJsSzTa6dcZoCJWX37rb7rG61iE+L2krGfR lPnREFXuRwTYChyhS5/CWA+Cp0xs/m0gUEGuHU2p68XkaCpZGej2CCMWB 0fY3U5DFSDnSZuwghnKv5YE3i8/5G7qUDvRJb39P1dUZnimorT2I63KRk 1qNVXm0oiIHu3wnEvvzuk59WiyJoGwkdcAkLI9/e0vwIhB81Qsp6aukUq Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742774" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742774" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:11 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128599" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:09 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 07/24] linux-yocto/5.10: update to v5.10.84 Date: Wed, 5 Jan 2022 23:18:27 +0800 Message-Id: X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:11 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160192 From: Bruce Ashfield Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits: a0582e24d371 Linux 5.10.84 e6edaf267793 ipmi: msghandler: Make symbol 'remove_work_wq' static a8d18fb4d11b net/tls: Fix authentication failure in CCM mode dbe73dace94c parisc: Mark cr16 CPU clocksource unstable on all SMP machines 01300d21505d iwlwifi: mvm: retry init flow if failed a5d0a72b805e serial: 8250: Fix RTS modem control while in rs485 mode f9802d7049f5 serial: 8250_pci: rewrite pericom_do_set_divisor() 50b06889c86f serial: 8250_pci: Fix ACCES entries in pci_serial_quirks array e1722acf4f0d serial: core: fix transmit-buffer reset and memleak bda142bbeb31 serial: tegra: Change lower tolerance baud rate limit for tegra20 and tegra30 901f7e0aa4a6 serial: pl011: Add ACPI SBSA UART match id 946ded2287a0 tty: serial: msm_serial: Deactivate RX DMA for polling support 67d08450a08d x86/64/mm: Map all kernel memory into trampoline_pgd b3a519b5a580 x86/tsc: Disable clocksource watchdog for TSC on qualified platorms 1ed4a8fd363c x86/tsc: Add a timer to make sure TSC_adjust is always checked a92f044a9fcb usb: typec: tcpm: Wait in SNK_DEBOUNCED until disconnect 6d8c191bf464 USB: NO_LPM quirk Lenovo Powered USB-C Travel Hub 90c915051c3d xhci: Fix commad ring abort, write all 64 bits to CRCR register. 1235485c633e vgacon: Propagate console boot parameters before calling `vc_resize' 92b9113c6df0 parisc: Fix "make install" on newer debian releases c27a548d3f29 parisc: Fix KBUILD_IMAGE for self-extracting kernel 92f309c838fc x86/entry: Add a fence for kernel entry SWAPGS in paranoid_entry() 4bbbc9c4f313 x86/pv: Switch SWAPGS to ALTERNATIVE 4d42b7bcf09d sched/uclamp: Fix rq->uclamp_max not set on first enqueue 2015ffa3a4c2 x86/xen: Add xenpv_restore_regs_and_return_to_usermode() 8b9279cad291 x86/entry: Use the correct fence macro after swapgs in kernel CR3 c8e341191849 x86/sev: Fix SEV-ES INS/OUTS instructions for word, dword, and qword 64ca109bf875 KVM: VMX: Set failure code in prepare_vmcs02() 60ce9a754060 KVM: x86/pmu: Fix reserved bits for AMD PerfEvtSeln register cfebd5a277ad atlantic: Remove warn trace message. 95f6fae9a0db atlantic: Fix statistics logic for production hardware 695d9c6bc671 Remove Half duplex mode speed capabilities. 0c67e7b98fab atlantic: Add missing DIDs and fix 115c. ca350298bccb atlantic: Fix to display FW bundle version instead of FW mac version. 93a4f3f4fdb5 atlatnic: enable Nbase-t speeds with base-t 44812111a3b1 atlantic: Increase delay for fw transactions 13f290d5aa4a drm/msm: Do hw_init() before capturing GPU state d646856a600e drm/msm/a6xx: Allocate enough space for GMU registers a792b3d56438 net/smc: Keep smc_close_final rc during active close e226180acc49 net/rds: correct socket tunable error in rds_tcp_tune() 77731fede297 net/smc: fix wrong list_del in smc_lgr_cleanup_early 9a40a1e0eb50 ipv4: convert fib_num_tclassid_users to atomic_t fa973bf5fd0f net: annotate data-races on txq->xmit_lock_owner e26dab79e16b dpaa2-eth: destroy workqueue at the end of remove function dde240695d97 net: marvell: mvpp2: Fix the computation of shared CPUs 3260b8d12057 net: usb: lan78xx: lan78xx_phy_init(): use PHY_POLL instead of "0" if no IRQ is available acef1c2b1596 ALSA: intel-dsp-config: add quirk for CML devices based on ES8336 codec 60f0b9c42cb8 rxrpc: Fix rxrpc_local leak in rxrpc_lookup_peer() 35b40f724c4e rxrpc: Fix rxrpc_peer leak in rxrpc_look_up_bundle() 4afb32090a15 ASoC: tegra: Fix kcontrol put callback in AHUB fe4eb5297ac3 ASoC: tegra: Fix kcontrol put callback in DSPK 256aa15aac6d ASoC: tegra: Fix kcontrol put callback in DMIC 1cf1f9a1f3ed ASoC: tegra: Fix kcontrol put callback in I2S 0ee53a1d8889 ASoC: tegra: Fix kcontrol put callback in ADMAIF e6fb4c3fd35b ASoC: tegra: Fix wrong value type in DSPK 0265ef0dff5e ASoC: tegra: Fix wrong value type in DMIC e66e75fb2278 ASoC: tegra: Fix wrong value type in I2S 6b54c0d845e5 ASoC: tegra: Fix wrong value type in ADMAIF 932b338f4e5c mt76: mt7915: fix NULL pointer dereference in mt7915_get_phy_mode a0335cda6d92 selftests: net: Correct case name f1d43efa59f1 net/mlx4_en: Fix an use-after-free bug in mlx4_en_try_alloc_resources() 59d2dc771006 arm64: ftrace: add missing BTIs ef55f0f8af2b siphash: use _unaligned version by default fd52e1f8c093 net: mpls: Fix notifications when deleting a device 15fa12c119f8 net: qlogic: qlcnic: Fix a NULL pointer dereference in qlcnic_83xx_add_rings() c6f340a331fb tcp: fix page frag corruption on page fault aa6c393a3c3f natsemi: xtensa: fix section mismatch warnings 289ee320b5ed i2c: cbus-gpio: set atomic transfer callback 58d5c53f2589 i2c: stm32f7: stop dma transfer in case of NACK c22124491752 i2c: stm32f7: recover the bus on access timeout 8de6ea757c88 i2c: stm32f7: flush TX FIFO upon transfer errors 1c75779dd90c wireguard: ratelimiter: use kvcalloc() instead of kvzalloc() cb2d7c1992cb wireguard: receive: drop handshakes if queue lock is contended 8a29a50dbdb1 wireguard: receive: use ring buffer for incoming handshakes e3be118327a1 wireguard: device: reset peer src endpoint when netns exits f7b6672fab70 wireguard: selftests: rename DEBUG_PI_LIST to DEBUG_PLIST 0584bf51c315 wireguard: selftests: actually test for routing loops 3d1dc3c67773 wireguard: allowedips: add missing __rcu annotation to satisfy sparse 4caf965f6cbe wireguard: selftests: increase default dmesg log size 3d73021f8d74 tracing/histograms: String compares should not care about signed values d4af6d974951 KVM: X86: Use vcpu->arch.walk_mmu for kvm_mmu_invlpg() c71b5f37b5ff KVM: arm64: Avoid setting the upper 32 bits of TCR_EL2 and CPTR_EL2 to 1 5f33887a3682 KVM: x86: Use a stable condition around all VT-d PI paths 7722e8850522 KVM: nVMX: Flush current VPID (L1 vs. L2) for KVM_REQ_TLB_FLUSH_GUEST 6a44f200f1f1 KVM: Disallow user memslot with size that exceeds "unsigned long" 775191dd4c1b drm/amd/display: Allow DSC on supported MST branch devices 209d35ee34e2 ipv6: fix memory leak in fib6_rule_suppress 16c242b09106 sata_fsl: fix warning in remove_proc_entry when rmmod sata_fsl 4a46b2f5dce0 sata_fsl: fix UAF in sata_fsl_port_stop when rmmod sata_fsl 4baba6ba56eb fget: check that the fd still exists after getting a ref to it 80bfed369be9 s390/pci: move pseudo-MMIO to prevent MIO overlap 92283c2728a9 cpufreq: Fix get_cpu_device() failure in add_cpu_dev_symlink() f717f29e8468 ipmi: Move remove_work to dedicated workqueue de4f5eb02cfe rt2x00: do not mark device gone on EPROTO errors during start c200721f8eda kprobes: Limit max data_size of the kretprobe instances 2a74c13dfe83 vrf: Reset IPCB/IP6CB when processing outbound pkts in vrf dev xmit 136cabf15779 ACPI: Add stubs for wakeup handler functions cc443ac5bb31 net/smc: Avoid warning of possible recursive locking ff061b5bda73 perf report: Fix memory leaks around perf_tip() a4c17ebdd624 perf hist: Fix memory leak of a perf_hpp_fmt d9b72274f32a perf inject: Fix ARM SPE handling 2c15d2a6ba27 net: ethernet: dec: tulip: de4x5: fix possible array overflows in type3_infoblock() f059fa40f0fc net: tulip: de4x5: fix the problem that the array 'lp->phy[8]' may be out of bound 4d5968ea06fb ipv6: check return value of ipv6_skip_exthdr 22519eff7df2 ethernet: hisilicon: hns: hns_dsaf_misc: fix a possible array overflow in hns_dsaf_ge_srst_by_port() 9a32d3c08d8e ata: ahci: Add Green Sardine vendor ID as board_ahci_mobile c746945fb6bc drm/amd/amdgpu: fix potential memleak 74aafe99efb6 drm/amd/amdkfd: Fix kernel panic when reset failed and been triggered again f0c9f49b0caf scsi: iscsi: Unblock session then wake up error handler bc8c423a286a thermal: core: Reset previous low and high trip during thermal zone init 8e4d2ac4348a btrfs: check-integrity: fix a warning on write caching disabled disk 039572290531 s390/setup: avoid using memblock_enforce_memory_limit fd1e70ef65ee platform/x86: thinkpad_acpi: Fix WWAN device disabled issue after S3 deep 226b21ad01ae platform/x86: thinkpad_acpi: Add support for dual fan control 3fc88660ede6 net: return correct error code 2c514d25003a atlantic: Fix OOB read and write in hw_atl_utils_fw_rpc_wait ff6eeb627898 net/smc: Transfer remaining wait queue entries during fallback e1a165599aad mac80211: do not access the IV when it was stripped c386d7aa59f5 drm/sun4i: fix unmet dependency on RESET_CONTROLLER for PHY_SUN6I_MIPI_DPHY 57e36973fadb powerpc/pseries/ddw: Revert "Extend upper limit for huge DMA window for persistent memory" 7b2b7e03e8ea gfs2: Fix length of holes reported at end-of-file 664cceab6f70 gfs2: release iopen glock early in evict bcce010f9230 ovl: fix deadlock in splice write dca4f9a58196 ovl: simplify file splice 7774dd934a65 can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM 60ae63ef194a NFSv42: Fix pagecache invalidation after COPY/CLONE a324ad794566 Linux 5.10.83 45b42cd05391 drm/amdgpu/gfx9: switch to golden tsc registers for renoir+ 98b02755d544 net: stmmac: platform: fix build warning when with !CONFIG_PM_SLEEP a15261d2a121 shm: extend forced shm destroy to support objects from several IPC nses aa20e966d8a1 s390/mm: validate VMA in PGSTE manipulation functions a94e4a7b77ed tty: hvc: replace BUG_ON() with negative return value 1c5f722a8fdf xen/netfront: don't trust the backend response data blindly 334b0f278761 xen/netfront: disentangle tx_skb_freelist e17ee047eea7 xen/netfront: don't read data from request on the ring page f5e493709800 xen/netfront: read response from backend only once 1ffb20f0527d xen/blkfront: don't trust the backend response data blindly 8e147855fcf2 xen/blkfront: don't take local copy of a request from the ring page 273f04d5d135 xen/blkfront: read response from backend only once b98284aa3fc5 xen: sync include/xen/interface/io/ring.h with Xen's newest version 406f2d5fe368 tracing: Check pid filtering when creating events 4fd0ad08ee33 vhost/vsock: fix incorrect used length reported to the guest fbc0514e1a34 iommu/amd: Clarify AMD IOMMUv2 initialization messages 5655b8bccb8a smb3: do not error on fsync when readonly c380062d0850 ceph: properly handle statfs on multifs setups 22423c966e02 f2fs: set SBI_NEED_FSCK flag when inconsistent node block found e6ee7abd6bfe sched/scs: Reset task stack state in bringup_cpu() 71e38a0c7cf8 tcp: correctly handle increased zerocopy args struct size 72f2117e450b net: mscc: ocelot: correctly report the timestamping RX filters in ethtool 73115a2b38dd net: mscc: ocelot: don't downgrade timestamping RX filters in SIOCSHWTSTAMP 62343dadbb96 net: hns3: fix VF RSS failed problem after PF enable multi-TCs 215167df4512 net/smc: Don't call clcsock shutdown twice when smc shutdown 6e800ee43218 net: vlan: fix underflow for the real_dev refcnt ae2659d2c670 net/sched: sch_ets: don't peek at classes beyond 'nbands' e3509feb46fa tls: fix replacing proto_ops 22156242b104 tls: splice_read: fix record type check 3b6c71c097da MIPS: use 3-level pgtable for 64KB page size on MIPS_VA_BITS_48 a6a5d853f1e6 MIPS: loongson64: fix FTLB configuration 5e823dbee23c igb: fix netpoll exit with traffic f2a58ff3e3ad nvmet: use IOCB_NOWAIT only if the filesystem supports it 12ceb52f2cc4 net/smc: Fix loop in smc_listen c94cbd262b6a net/smc: Fix NULL pointer dereferencing in smc_vlan_by_tcpsk() 3d4937c6a328 net: phylink: Force retrigger in case of latched link-fail indicator 50162ff3c80f net: phylink: Force link down and retrigger resolve on interface change 95ba8f0d57ce lan743x: fix deadlock in lan743x_phy_link_status_change() c5e4316d9c02 tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows 318762309609 drm/amd/display: Set plane update flags for all planes in reset f634c755a0ee PM: hibernate: use correct mode for swsusp_close() 440bd9faad29 net/ncsi : Add payload to be 32-bit aligned to fix dropped packets ac88cb3c44b6 nvmet-tcp: fix incomplete data digest send 8889ff80fde3 net: marvell: mvpp2: increase MTU limit when XDP enabled 90d0736876c5 mlxsw: spectrum: Protect driver from buggy firmware 33d89128a960 mlxsw: Verify the accessed index doesn't exceed the array length 29e1b5734795 net/smc: Ensure the active closing peer first closes clcsock 77d9c2efa870 erofs: fix deadlock when shrink erofs slab 9f540c7ffb1e scsi: scsi_debug: Zero clear zones at reset write pointer 725ba1289508 scsi: core: sysfs: Fix setting device state to SDEV_RUNNING e65a8707b4cd ice: avoid bpf_prog refcount underflow 1eb5395add78 ice: fix vsi->txq_map sizing 26ed13d06422 net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group 3c40584595f8 net: ipv6: add fib6_nh_release_dsts stub dc2f7e9d8d20 net: stmmac: retain PTP clock time during SIOCSHWTSTAMP ioctls 79068e6b1cfb net: stmmac: fix system hang caused by eee_ctrl_timer during suspend/resume cc301ad31207 nfp: checking parameter process for rx-usecs/tx-usecs is invalid 9b44cb67d387 ipv6: fix typos in __ip6_finish_output() 6d9e8dabd46f firmware: smccc: Fix check for ARCH_SOC_ID not implemented bbd1683e795c mptcp: fix delack timer 061542815af1 ALSA: intel-dsp-config: add quirk for JSL devices based on ES8336 codec f5af2def7e05 iavf: Prevent changing static ITR values if adaptive moderation is on 5dca8eff4627 net: marvell: prestera: fix double free issue on err path b33c5c828144 drm/vc4: fix error code in vc4_create_object() 2bf9c5a5039c scsi: mpt3sas: Fix kernel panic during drive powercycle test 29ecb4c0f0d7 drm/nouveau/acr: fix a couple NULL vs IS_ERR() checks 0effb7f51b65 ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE 86c5adc78083 NFSv42: Don't fail clone() unless the OP_CLONE operation failed c9ba7864d3a2 firmware: arm_scmi: pm: Propagate return value to caller 8730a679c3cb net: ieee802154: handle iftypes as u32 2925aadd1f32 ASoC: codecs: wcd934x: return error code correctly from hw_params 3a25def06de8 ASoC: topology: Add missing rwsem around snd_ctl_remove() calls 4a4f900e0415 ASoC: qdsp6: q6asm: fix q6asm_dai_prepare error handling 9196a6858150 ASoC: qdsp6: q6routing: Conditionally reset FrontEnd Mixer 2be17eca48ae ARM: dts: bcm2711: Fix PCIe interrupts 9db1d4a3c270 ARM: dts: BCM5301X: Add interrupt properties to GPIO node b2cd6fdcbe0a ARM: dts: BCM5301X: Fix I2C controller interrupt b7ef25e8c271 netfilter: flowtable: fix IPv6 tunnel addr match d689176e0e18 netfilter: ipvs: Fix reuse connection if RS weight is 0 994065f6efdc netfilter: ctnetlink: do not erase error code with EINVAL a3d829e5f375 netfilter: ctnetlink: fix filtering with CTA_TUPLE_REPLY a8a917058faf proc/vmcore: fix clearing user buffer by properly using clear_user() 1f520a0d78fc PCI: aardvark: Fix link training aec0751f61f5 PCI: aardvark: Simplify initialization of rootcap on virtual bridge df5748098878 PCI: aardvark: Implement re-issuing config requests on CRS response e7f2e2c758ea PCI: aardvark: Update comment about disabling link training 2b7bc1c4b2c8 PCI: aardvark: Deduplicate code in advk_pcie_rd_conf() dfe906da9a1a powerpc/32: Fix hardlockup on vmap stack overflow bf00edd9e6c9 mdio: aspeed: Fix "Link is Down" issue 14c3ce30ddbd mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB 63195705b334 mmc: sdhci-esdhc-imx: disable CMDQ support 092a58f0d9ef tracing: Fix pid filtering when triggers are attached 68fa6bf7f179 tracing/uprobe: Fix uprobe_perf_open probes iteration b777c866aafc KVM: PPC: Book3S HV: Prevent POWER7/8 TLB flush flushing SLB bfed9c2f2f2e xen: detect uninitialized xenbus in xenbus_init e1d492c27519 xen: don't continue xenstore initialization in case of errors 8f4d0719f323 fuse: release pipe buf after last use 8d0163cec7de staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect() 0bfed81b2ccd staging: greybus: Add missing rwsem around snd_ctl_remove() calls 146283f16b7e staging/fbtft: Fix backlight 8fc5e3c7cacc HID: wacom: Use "Confidence" flag to prevent reporting invalid contacts 6ca32e2e776e Revert "parisc: Fix backtrace to always include init funtion names" 3a4aeb37a7a6 media: cec: copy sequence field for the reply 3798218a1af4 ALSA: hda/realtek: Fix LED on HP ProBook 435 G7 60274e248e3d ALSA: hda/realtek: Add quirk for ASRock NUC Box 1100 172167bc8dac ALSA: ctxfi: Fix out-of-range access 4402cf040252 binder: fix test regression due to sender_euid change aea184ae6408 usb: hub: Fix locking issues with address0_mutex 5bf3a0c7789e usb: hub: Fix usb enumeration issue due to address0 race 00f1038c72f8 usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts 56fbab4937e0 usb: chipidea: ci_hdrc_imx: fix potential error pointer dereference in probe b70ff391deee net: nexthop: fix null pointer dereference when IPv6 is not enabled 0755f3f32277 usb: dwc3: gadget: Fix null pointer exception 140e2df472ba usb: dwc3: gadget: Check for L1/L2/U3 for Start Transfer 3abf746e800b usb: dwc3: gadget: Ignore NoStream after End Transfer 2b7ab82f5173 usb: dwc2: hcd_queue: Fix use of floating point literal 4b18ccad9671 usb: dwc2: gadget: Fix ISOC flow for elapsed frames 16f1cac8f702 USB: serial: option: add Fibocom FM101-GL variants ff721286369e USB: serial: option: add Telit LE910S1 0x9200 composition 854c14b2a15c ACPI: Get acpi_device's parent from the parent field 33fe044f6a9e bpf: Fix toctou on read-only map's constant scalar tracking Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit e8adc08ef64a894a638ed07454bcbe5ead881149) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index c572e432de..d705f1de69 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "23f3ad608bc75fc89f49a533ac4e5ed8deaa33b0" -SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3" +SRCREV_machine ?= "b964618dbcfd6f010b0204e1b3bf575c2ce17920" +SRCREV_meta ?= "5bdb3bf9619c5f2b928fc784aa0082d399d83fbb" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.82" +LINUX_VERSION ?= "5.10.84" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 5a1adf6e8b..035d2afd50 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.82" +LINUX_VERSION ?= "5.10.84" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "01f85f09232df2aa45edd757150cb03e35f41f3b" -SRCREV_machine ?= "f0a0ddc2f355d02a706454137d3dab7889fcf4d1" -SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3" +SRCREV_machine_qemuarm ?= "93faaef91af9e57e70cadd27338f62a4afce83aa" +SRCREV_machine ?= "fa8269a92a01127ad6627f751cdac5cdbfd527a6" +SRCREV_meta ?= "5bdb3bf9619c5f2b928fc784aa0082d399d83fbb" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 216b0ef6f2..18d2dfc67f 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "74d64de12f376533a34ec582c19b0dc698aea8fc" -SRCREV_machine_qemuarm64 ?= "0e5d783a705e4c4846cc34d0fd26bf8645bdfb24" -SRCREV_machine_qemumips ?= "4a8d5630df98b660aeb137a0ca24021e8e9243bb" -SRCREV_machine_qemuppc ?= "36a9597fcd7083cab43c5c1ec17c7e7b0ce3fab3" -SRCREV_machine_qemuriscv64 ?= "1bb9d730ac6630d3f41c2ef529fab09f12bcf07d" -SRCREV_machine_qemuriscv32 ?= "1bb9d730ac6630d3f41c2ef529fab09f12bcf07d" -SRCREV_machine_qemux86 ?= "1bb9d730ac6630d3f41c2ef529fab09f12bcf07d" -SRCREV_machine_qemux86-64 ?= "1bb9d730ac6630d3f41c2ef529fab09f12bcf07d" -SRCREV_machine_qemumips64 ?= "690b09d3a24bafeff32bb06a72643be0c8fae9a7" -SRCREV_machine ?= "1bb9d730ac6630d3f41c2ef529fab09f12bcf07d" -SRCREV_meta ?= "64fb693a6c11f21bab3ff9bb8dcb65a70abe05e3" +SRCREV_machine_qemuarm ?= "765d9bff031ec7198a3e5359127249df19b8bdfa" +SRCREV_machine_qemuarm64 ?= "c1bb5868e46a792e176b842aefc98dea2727e5fa" +SRCREV_machine_qemumips ?= "63624e5dfe27ae4f9caa4a70b12eec4e63a9e557" +SRCREV_machine_qemuppc ?= "d054e2117a15fe0155fde3878811cf233fca3f83" +SRCREV_machine_qemuriscv64 ?= "7a88f25e2d0e2dd2da6f0e9cab91e0d097b9e10a" +SRCREV_machine_qemuriscv32 ?= "7a88f25e2d0e2dd2da6f0e9cab91e0d097b9e10a" +SRCREV_machine_qemux86 ?= "7a88f25e2d0e2dd2da6f0e9cab91e0d097b9e10a" +SRCREV_machine_qemux86-64 ?= "7a88f25e2d0e2dd2da6f0e9cab91e0d097b9e10a" +SRCREV_machine_qemumips64 ?= "d435de927eb2adb0cfcd49572bb71ce7ff31035d" +SRCREV_machine ?= "7a88f25e2d0e2dd2da6f0e9cab91e0d097b9e10a" +SRCREV_meta ?= "5bdb3bf9619c5f2b928fc784aa0082d399d83fbb" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -32,7 +32,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-5.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.82" +LINUX_VERSION ?= "5.10.84" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Wed Jan 5 15:18:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2070 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 02063C433F5 for ; Wed, 5 Jan 2022 15:19:14 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:13 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=k2gZHxYe; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395953; x=1672931953; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=rt+15h9lHmXU9IepheSGDotIybC7U1vIMSSOcDTRcmE=; b=k2gZHxYecX2+eVxZ6VmXqxudG3HydJWZj8+0FMSMd3REwhUerZQashSx 7UTzczMAlVLWNpvycjFJ/9viRZym+jppLANgRKpDJcg/QO53Pe4ax2LIi +aaBf6fjKcOHrDs/uB9HbHmnvIRX7wY4Iv5vOunS2+HozTxpTaMO8dWLo NZPWiDpXXLukxD0Tq7Xg3aejYFKzP+0FIgkNRdwMe/uFPHzv9EXuZGhA2 RqMg/qqF4SmOQkyrZwnj5ox0iEA2ayx4ZPJvEUsrvVP+8uj2m82WbcDSZ A9HmwEiwmCWA3kRQpTMgqrivbVl/U7EPzoaOrv4tzQyQCDXdIYF39Bxik g==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742780" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742780" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:12 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128613" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:11 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 08/24] linux-yocto/5.10: update to v5.10.85 Date: Wed, 5 Jan 2022 23:18:28 +0800 Message-Id: X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160193 From: Bruce Ashfield Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits: e4f2aee6612e Linux 5.10.85 47301c06f602 Documentation/Kbuild: Remove references to gcc-plugin.sh af5ba49cf705 MAINTAINERS: adjust GCC PLUGINS after gcc-plugin.sh removal ad13421fd2cd doc: gcc-plugins: update gcc-plugins.rst 9fc17c3af56c kbuild: simplify GCC_PLUGINS enablement in dummy-tools/gcc d428e5477493 bpf: Add selftests to cover packet access corner cases 0ec0eda3f3c3 misc: fastrpc: fix improper packet size calculation 261d45a4c254 irqchip: nvic: Fix offset for Interrupt Priority Offsets cd946f0ebe78 irqchip/irq-gic-v3-its.c: Force synchronisation when issuing INVALL e1c6611f822e irqchip/armada-370-xp: Fix support for Multi-MSI interrupts 8f3ed9deaaac irqchip/armada-370-xp: Fix return value of armada_370_xp_msi_alloc() d530e9943d64 irqchip/aspeed-scu: Replace update_bits with write_bits. 014c2fa5dc49 csky: fix typo of fpu config macro ee86d0bad80b iio: accel: kxcjk-1013: Fix possible memory leak in probe and remove c10c53419d8d iio: ad7768-1: Call iio_trigger_notify_done() on error 0f86c9e818e7 iio: adc: axp20x_adc: fix charging current reporting on AXP22x af7fbb8c0b54 iio: adc: stm32: fix a current leak by resetting pcsel before disabling vdda fff92f3712d7 iio: at91-sama5d2: Fix incorrect sign extension a2545b147d23 iio: dln2: Check return value of devm_iio_trigger_register() 69ae78c1abe7 iio: dln2-adc: Fix lockdep complaint 416383999c66 iio: itg3200: Call iio_trigger_notify_done() on error bc4d8367ed0d iio: kxsd9: Don't return error code in trigger handler 28ea539a311e iio: ltr501: Don't return error code in trigger handler db12d9508536 iio: mma8452: Fix trigger reference couting 4e7852911084 iio: stk3310: Don't return error code in interrupt handler 5c4a0f307f2b iio: trigger: stm32-timer: fix MODULE_ALIAS 5de9c5b13062 iio: trigger: Fix reference counting cbc04c0c9a67 iio: gyro: adxrs290: fix data signedness fee8be5bde56 xhci: avoid race between disable slot command and host runtime suspend 1b43c9b65f6b usb: core: config: using bit mask instead of individual bits 74b6a6a239aa xhci: Remove CONFIG_USB_DEFAULT_PERSIST to prevent xHCI from runtime suspending ef284f086dd0 usb: core: config: fix validation of wMaxPacketValue entries e4de8ca013f0 USB: gadget: zero allocate endpoint 0 buffers 7193ad3e50e5 USB: gadget: detect too-big endpoint 0 requests 63fc70bffa16 selftests/fib_tests: Rework fib_rp_filter_test() 126d1897cbff net/qla3xxx: fix an error code in ql_adapter_up() 5e663bcd9a37 net, neigh: clear whole pneigh_entry at alloc time ae673832086e net: fec: only clear interrupt of handling queue in fec_enet_rx_queue() 83b16b9c441b net: altera: set a couple error code in probe() 385ffd31ebdb net: cdc_ncm: Allow for dwNtbOutMaxSize to be unset or zero 47322fddb41e tools build: Remove needless libpython-version feature check that breaks test-all fast path 42bea3a1b7f2 dt-bindings: net: Reintroduce PHY no lane swap binding 3f57215f748b Documentation/locking/locktypes: Update migrate_disable() bits. 77d255d28b34 perf tools: Fix SMT detection fast read path 391ca20ea16e Revert "PCI: aardvark: Fix support for PCI_ROM_ADDRESS1 on emulated bridge" e5b7fb2198ab i40e: Fix NULL pointer dereference in i40e_dbg_dump_desc 347cc9b4d966 mtd: rawnand: fsmc: Fix timing computation 0b2e1fccdf48 mtd: rawnand: fsmc: Take instruction delay into account 57f290572f45 i40e: Fix pre-set max number of queues for VF eb87117c27e7 i40e: Fix failed opcode appearing if handling messages from VF 82ed3829c937 clk: imx: use module_platform_driver 4d12546cf9e7 RDMA/hns: Do not destroy QP resources in the hw resetting phase 33f320c35d69 RDMA/hns: Do not halt commands during reset until later 4458938b297e ASoC: codecs: wcd934x: return correct value from mixer put 1089dac26c6b ASoC: codecs: wcd934x: handle channel mappping list correctly 83dae68fc00a ASoC: codecs: wsa881x: fix return values from kcontrol put 62e4dc5e130e ASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer 2f4764fe3692 ASoC: rt5682: Fix crash due to out of scope stack vars bdd8129c6605 PM: runtime: Fix pm_runtime_active() kerneldoc comment 661c4412c563 qede: validate non LSO skb length c4d2d7c935a4 scsi: scsi_debug: Fix buffer size of REPORT ZONES command 1e434d2687e8 scsi: pm80xx: Do not call scsi_remove_host() in pm8001_alloc() 5dfe61147442 block: fix ioprio_get(IOPRIO_WHO_PGRP) vs setuid(2) 5f1f94c26b0d tracefs: Set all files to the same group ownership as the mount option 2ba0738f7117 net: mvpp2: fix XDP rx queues registering 47ffefd88abf aio: fix use-after-free due to missing POLLFREE handling e4d19740bcca aio: keep poll requests on waitqueue until completed fc2f636ffc44 signalfd: use wake_up_pollfree() 9f3acee7eac8 binder: use wake_up_pollfree() 8e04c8397bf9 wait: add wake_up_pollfree() 2f8eb4c4c8f6 libata: add horkage for ASMedia 1092 f76580d82c62 can: m_can: Disable and ignore ELO interrupt 703dde112021 can: pch_can: pch_can_rx_normal: fix use after free 2737d0bc21b6 drm/syncobj: Deal with signalled fences in drm_syncobj_find_fence. 17edb38e76d6 clk: qcom: regmap-mux: fix parent clock lookup 172a98224418 mmc: renesas_sdhi: initialize variable properly when tuning 33204825cc2b tracefs: Have new files inherit the ownership of their parent c520943a00ad nfsd: Fix nsfd startup race (again) eeb0711801f5 nfsd: fix use-after-free due to delegation race 8b4264c27b82 md: fix update super 1.0 on rdev size change caf9b352dc58 btrfs: replace the BUG_ON in btrfs_del_root_ref with proper error handling 41b3cc57d626 btrfs: clear extent buffer uptodate when we fail to write it 75490bcbd076 scsi: qla2xxx: Format log strings only if needed 07977a3f3d55 ALSA: pcm: oss: Handle missing errors in snd_pcm_oss_change_params*() ad45babf7886 ALSA: pcm: oss: Limit the period size to 16MB 02b2b691b77c ALSA: pcm: oss: Fix negative period/buffer sizes 6760e6ddeb48 ALSA: hda/realtek: Fix quirk for TongFang PHxTxX1 7fe903d35492 ALSA: hda/realtek - Add headset Mic support for Lenovo ALC897 platform 3063ee5164e4 ALSA: ctl: Fix copy of updated id with element read/write c581090228e3 mm: bdi: initialize bdi_min_ratio when bdi is unregistered 06368922f38f KVM: x86: Wait for IPIs to be delivered when handling Hyper-V TLB flush hypercall 2a51edaf5cc5 net/sched: fq_pie: prevent dismantle issue 4b7e90672af8 devlink: fix netns refcount leak in devlink_nl_cmd_reload() 9d683d14f600 IB/hfi1: Correct guard on eager buffer deallocation 2e2edebb5dd6 iavf: Fix reporting when setting descriptor count aada0b3f3392 iavf: restore MSI state on reset 32a329b731a3 netfilter: conntrack: annotate data-races around ct->timeout 5e39de85b76e udp: using datalen to cap max gso segments 666521b3852d seg6: fix the iif in the IPv6 socket control block 484069b5de9d nfp: Fix memory leak in nfp_cpp_area_cache_add() b1830ede16f8 bonding: make tx_rebalance_counter an atomic a59df4ea7155 ice: ignore dropped packets during init 349e83c0cf67 bpf: Fix the off-by-two error in range markings f26951db84a4 bpf, x86: Fix "no previous prototype" warning 74685aaecef0 vrf: don't run conntrack on vrf with !dflt qdisc d5cf399a6dc3 selftests: netfilter: add a vrf+conntrack testcase 83ea620a1be8 nfc: fix potential NULL pointer deref in nfc_genl_dump_ses_done f3d9114ac99f drm/amdkfd: fix boot failure when iommu is disabled in Picasso. 7508a9aa65b9 drm/amdgpu: init iommu after amdkfd device init ac9db04ee32f drm/amdgpu: move iommu_resume before ip init/resume fe9dca7dda61 drm/amdgpu: add amdgpu_amdkfd_resume_iommu 5d191b0976b7 drm/amdkfd: separate kfd_iommu_resume from kfd_resume 46dcf66d6e7a drm/amd/amdkfd: adjust dummy functions' placement dded8d76a7dc x86/sme: Explicitly map new EFI memmap table as encrypted 923f4dc5df67 can: sja1000: fix use after free in ems_pcmcia_add_card() 819251da7178 can: kvaser_pciefd: kvaser_pciefd_rx_error_frame(): increase correct stats->{rx,tx}_errors counter 854a2bede1f0 can: kvaser_usb: get CAN clock frequency from device 2c08271f4ed0 IB/hfi1: Fix leak of rcvhdrtail_dummy_kvaddr d87c10607b5b IB/hfi1: Fix early init panic d60dd3685dc9 IB/hfi1: Insure use of smp_processor_id() is preempt disabled 05eb0e4a12b2 nft_set_pipapo: Fix bucket load in AVX2 lookup routine for six 8-bit groups 89f3edc98ffe HID: check for valid USB device for many HID drivers 889c39113f7e HID: wacom: fix problems when device is not a valid USB device 6272b17001e6 HID: bigbenff: prevent null pointer dereference d877651afd60 HID: add USB_HID dependancy on some USB HID drivers a7e9c5ddf562 HID: add USB_HID dependancy to hid-chicony 28989ed4d79e HID: add USB_HID dependancy to hid-prodikeys 61144329606c HID: add hid_is_usb() function to make it simpler for USB detection 2298d5edd837 HID: google: add eel USB id 12362cd3a409 HID: quirks: Add quirk for the Microsoft Surface 3 type-cover cc97d7321595 gcc-plugins: fix gcc 11 indigestion with plugins... 1eee36a5520b gcc-plugins: simplify GCC plugin-dev capability test 518c3f98e57a usb: gadget: uvc: fix multiple opens Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit c6503f8a57197826c4a939ca9212f075c156f14f) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index d705f1de69..76832251b7 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "b964618dbcfd6f010b0204e1b3bf575c2ce17920" -SRCREV_meta ?= "5bdb3bf9619c5f2b928fc784aa0082d399d83fbb" +SRCREV_machine ?= "97b3d2f0923ab9e9a9eb47c284006cddb0156146" +SRCREV_meta ?= "be7b73b2c0e453724d18520ae165b5d474735578" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.84" +LINUX_VERSION ?= "5.10.85" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 035d2afd50..0071c60c75 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.84" +LINUX_VERSION ?= "5.10.85" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "93faaef91af9e57e70cadd27338f62a4afce83aa" -SRCREV_machine ?= "fa8269a92a01127ad6627f751cdac5cdbfd527a6" -SRCREV_meta ?= "5bdb3bf9619c5f2b928fc784aa0082d399d83fbb" +SRCREV_machine_qemuarm ?= "615408bf1ba1cbc40750334329f97ea2b56e3d63" +SRCREV_machine ?= "3bd3c6de33c2efcef6feaa0f2624e8adc900bda7" +SRCREV_meta ?= "be7b73b2c0e453724d18520ae165b5d474735578" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index 18d2dfc67f..bcf9534b19 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "765d9bff031ec7198a3e5359127249df19b8bdfa" -SRCREV_machine_qemuarm64 ?= "c1bb5868e46a792e176b842aefc98dea2727e5fa" -SRCREV_machine_qemumips ?= "63624e5dfe27ae4f9caa4a70b12eec4e63a9e557" -SRCREV_machine_qemuppc ?= "d054e2117a15fe0155fde3878811cf233fca3f83" -SRCREV_machine_qemuriscv64 ?= "7a88f25e2d0e2dd2da6f0e9cab91e0d097b9e10a" -SRCREV_machine_qemuriscv32 ?= "7a88f25e2d0e2dd2da6f0e9cab91e0d097b9e10a" -SRCREV_machine_qemux86 ?= "7a88f25e2d0e2dd2da6f0e9cab91e0d097b9e10a" -SRCREV_machine_qemux86-64 ?= "7a88f25e2d0e2dd2da6f0e9cab91e0d097b9e10a" -SRCREV_machine_qemumips64 ?= "d435de927eb2adb0cfcd49572bb71ce7ff31035d" -SRCREV_machine ?= "7a88f25e2d0e2dd2da6f0e9cab91e0d097b9e10a" -SRCREV_meta ?= "5bdb3bf9619c5f2b928fc784aa0082d399d83fbb" +SRCREV_machine_qemuarm ?= "bd67fa7bae301072f17d78b932b833f2f9db6d79" +SRCREV_machine_qemuarm64 ?= "10e6f0bc97e599902f6c98213945685d0fd4a780" +SRCREV_machine_qemumips ?= "960862d5d1b51892b7cd621ba9d54f89dc99dc0b" +SRCREV_machine_qemuppc ?= "5c4c88cb82cbc6aff04ecf12f4c34d0bc5dc90c4" +SRCREV_machine_qemuriscv64 ?= "299cd9fdd1a66ad4ce643a6536648228669a50fb" +SRCREV_machine_qemuriscv32 ?= "299cd9fdd1a66ad4ce643a6536648228669a50fb" +SRCREV_machine_qemux86 ?= "299cd9fdd1a66ad4ce643a6536648228669a50fb" +SRCREV_machine_qemux86-64 ?= "299cd9fdd1a66ad4ce643a6536648228669a50fb" +SRCREV_machine_qemumips64 ?= "9e7fb877bb5fe2aaec720cf181e07e2db397e68f" +SRCREV_machine ?= "299cd9fdd1a66ad4ce643a6536648228669a50fb" +SRCREV_meta ?= "be7b73b2c0e453724d18520ae165b5d474735578" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -32,7 +32,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-5.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.84" +LINUX_VERSION ?= "5.10.85" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Wed Jan 5 15:18:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2071 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 EDE70C433EF for ; Wed, 5 Jan 2022 15:19:14 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:14 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=goOqrHTF; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395954; x=1672931954; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=nLz76hXatjFD7TnJgxayn6ZnL6EID9QxruaoyyGoSyI=; b=goOqrHTFSj76+yvfBOqHpYwjMhSw2iGZHkpIxgLNGAYP1fGR2hGnvJIB KqoxOTs+h801QaiANL8MhLH0zCLdsbZSSGkQtg8+bCtiOAtIXUM3qK8QQ uWDEtQ7DN4bkIKSfclnFgE3CuomKDIW0pPo9xqzmHgbIb3C2zGI+YWlZE p7rZnl+5zfto+ACuLZbu0mzS0qkONdX52QQi0Ju4ZbnSZMr0qnmUbBlXD S1TEi3KJjIkWYbCOknrn0VLwQCqjcua6mR6410ttGhfzr0w0cY+YFwa86 BY6l+Vq8j/wbfp0x2ck56OK1Idg0NP+ZyODEkrhGRZUZrmxc4ABpGxwbW Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742785" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742785" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:14 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128624" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:13 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 09/24] linux-yocto/5.10: update to v5.10.87 Date: Wed, 5 Jan 2022 23:18:29 +0800 Message-Id: X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:14 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160194 From: Bruce Ashfield Updating linux-yocto/5.10 to the latest korg -stable release that comprises the following commits: 272aedd4a305 Linux 5.10.87 8dd559d53b3b arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM 65c578935bcc arm: extend pfn_valid to take into account freed memory map alignment 6e634c0e7155 memblock: ensure there is no overflow in memblock_overlaps_region() 74551f13c62f memblock: align freed memory map on pageblock boundaries with SPARSEMEM b4b54c7ba149 memblock: free_unused_memmap: use pageblock units instead of MAX_ORDER b6a1cbd187fc perf intel-pt: Fix error timestamp setting on the decoder error path 0612aa02c2c8 perf intel-pt: Fix missing 'instruction' events with 'q' option 71c795028b31 perf intel-pt: Fix next 'err' value, walking trace 02681dd1780a perf intel-pt: Fix state setting when receiving overflow (OVF) packet cbed09b44ce0 perf intel-pt: Fix intel_pt_fup_event() assumptions about setting state type 3bb7fd4be8c4 perf intel-pt: Fix sync state when a PSB (synchronization) packet is found 731ff7884138 perf intel-pt: Fix some PGE (packet generation enable/control flow packets) usage b23f9252a41d perf inject: Fix itrace space allowed for new attributes 7c26da3be1e9 ethtool: do not perform operations on net devices being unregistered 6992d8c215c8 hwmon: (dell-smm) Fix warning on /proc/i8k creation error c31470a30c0d fuse: make sure reclaim doesn't write the inode 613725436e69 bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc 9099f3512678 staging: most: dim2: use device release method ac76adc87a78 KVM: x86: Ignore sparse banks size for an "all CPUs", non-sparse IPI req 6f0d9d3e74dc tracing: Fix a kmemleak false positive in tracing_map f35f7f04aa80 drm/amd/display: add connector type check for CRC source set dd3cea342522 drm/amd/display: Fix for the no Audio bug with Tiled Displays dadce61247c6 net: netlink: af_netlink: Prevent empty skb by adding a check on len. bca6af4325d6 i2c: rk3x: Handle a spurious start completion interrupt flag d6edec8a7b55 parisc/agp: Annotate parisc agp init functions with __init cf520ccffd9a ALSA: hda/hdmi: fix HDA codec entry table order for ADL-P 701a07fd0274 ALSA: hda: Add Intel DG2 PCI ID and HDMI codec vid 6d22a96d12d7 net/mlx4_en: Update reported link modes for 1/10G 999069d8b040 Revert "tty: serial: fsl_lpuart: drop earlycon entry for i.MX8QXP" 27f4ce02b31a s390/test_unwind: use raw opcode instead of invalid instruction 9eab949e2b90 KVM: arm64: Save PSTATE early on exit 990fd815ec88 drm/msm/dsi: set default num_data_lanes c602863ad28e nfc: fix segfault in nfc_genl_dump_devices_done 37050f17f2d2 Linux 5.10.86 32414491834c netfilter: selftest: conntrack_vrf.sh: fix file permission Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 41e6433af247105b9430d5fe2ef3e32624d6ed76) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.10.bb | 6 ++--- .../linux/linux-yocto-tiny_5.10.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.10.bb | 24 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb index 76832251b7..6a1f48bbb0 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.10.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "97b3d2f0923ab9e9a9eb47c284006cddb0156146" -SRCREV_meta ?= "be7b73b2c0e453724d18520ae165b5d474735578" +SRCREV_machine ?= "d6b1cc83a5315388b060eaa6195f1ce77103c3d1" +SRCREV_meta ?= "1ab943530f4016a9ee7bd8fc3d10acf702c23c44" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.10;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.10.85" +LINUX_VERSION ?= "5.10.87" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb index 0071c60c75..38c01b78b2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.10.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.10.85" +LINUX_VERSION ?= "5.10.87" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "615408bf1ba1cbc40750334329f97ea2b56e3d63" -SRCREV_machine ?= "3bd3c6de33c2efcef6feaa0f2624e8adc900bda7" -SRCREV_meta ?= "be7b73b2c0e453724d18520ae165b5d474735578" +SRCREV_machine_qemuarm ?= "a46d018920762d81e283ecc80cf156fe226712ed" +SRCREV_machine ?= "e36ccf7356af83243e55f6ca491049462f7feab7" +SRCREV_meta ?= "1ab943530f4016a9ee7bd8fc3d10acf702c23c44" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.10.bb b/meta/recipes-kernel/linux/linux-yocto_5.10.bb index bcf9534b19..1769dd402c 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.10.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.10.bb @@ -13,17 +13,17 @@ KBRANCH_qemux86 ?= "v5.10/standard/base" KBRANCH_qemux86-64 ?= "v5.10/standard/base" KBRANCH_qemumips64 ?= "v5.10/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "bd67fa7bae301072f17d78b932b833f2f9db6d79" -SRCREV_machine_qemuarm64 ?= "10e6f0bc97e599902f6c98213945685d0fd4a780" -SRCREV_machine_qemumips ?= "960862d5d1b51892b7cd621ba9d54f89dc99dc0b" -SRCREV_machine_qemuppc ?= "5c4c88cb82cbc6aff04ecf12f4c34d0bc5dc90c4" -SRCREV_machine_qemuriscv64 ?= "299cd9fdd1a66ad4ce643a6536648228669a50fb" -SRCREV_machine_qemuriscv32 ?= "299cd9fdd1a66ad4ce643a6536648228669a50fb" -SRCREV_machine_qemux86 ?= "299cd9fdd1a66ad4ce643a6536648228669a50fb" -SRCREV_machine_qemux86-64 ?= "299cd9fdd1a66ad4ce643a6536648228669a50fb" -SRCREV_machine_qemumips64 ?= "9e7fb877bb5fe2aaec720cf181e07e2db397e68f" -SRCREV_machine ?= "299cd9fdd1a66ad4ce643a6536648228669a50fb" -SRCREV_meta ?= "be7b73b2c0e453724d18520ae165b5d474735578" +SRCREV_machine_qemuarm ?= "c5c39f3ba284421eceeb9b084da1508167b37abe" +SRCREV_machine_qemuarm64 ?= "fab21fdf95a62d013b98eb91adc0d9cfc69f700b" +SRCREV_machine_qemumips ?= "ef1d4a1e93c209637022c9337131394a6f3679ae" +SRCREV_machine_qemuppc ?= "8009be617e2fd4c34c80892776d79f463d436fc0" +SRCREV_machine_qemuriscv64 ?= "4f2bb635ea267e71f112fd11323c1d3a2f2b85d0" +SRCREV_machine_qemuriscv32 ?= "4f2bb635ea267e71f112fd11323c1d3a2f2b85d0" +SRCREV_machine_qemux86 ?= "4f2bb635ea267e71f112fd11323c1d3a2f2b85d0" +SRCREV_machine_qemux86-64 ?= "4f2bb635ea267e71f112fd11323c1d3a2f2b85d0" +SRCREV_machine_qemumips64 ?= "2f42ab7aac37cd61f47231301b3f1e232807e0e6" +SRCREV_machine ?= "4f2bb635ea267e71f112fd11323c1d3a2f2b85d0" +SRCREV_meta ?= "1ab943530f4016a9ee7bd8fc3d10acf702c23c44" # remap qemuarm to qemuarma15 for the 5.8 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -32,7 +32,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-5.10;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.10.85" +LINUX_VERSION ?= "5.10.87" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Wed Jan 5 15:18:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2072 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 EE9AAC433EF for ; Wed, 5 Jan 2022 15:19:16 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:16 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=YZ6i5PgB; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395955; x=1672931955; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=fL8ojJ96eT1i+RIYGzpai1/JxQjf5vx7S/N7t8rCtQw=; b=YZ6i5PgBR1Lv/0TbbPXf98HQ/HhEo3SE5HxrOituMsty1dlVY2kk17JT opbPUvcjYm9o5tBqXp3mlgEcYM6qmmo6JOPnKH+YUWvj0MePRV96HGw3h 5dLRQl/QAiCaAomV5IM60NO/3itvOVmnlpuIJlTKGq892dlFOf0l0wPkx C8ESqRE8nd8mIg9j4i80XWPR5G8G/xNtaISq33bO+U8/ouD/BZs++V7Sl 71m4FI/EQSqMOheaR+Yp4d1r2bhuoRufNuoLwPic7ULxFlBNpKPYQuA/Q Vs1vLd4gHErt81MbzynQuneWLzyJHh/takeX+WhjyPhzUubHDuxTLuax0 g==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742799" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742799" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:15 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128630" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:14 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 10/24] linux-yocto/5.4: update to v5.4.159 Date: Wed, 5 Jan 2022 23:18:30 +0800 Message-Id: <89d59ed2163e77df2100aae4bc6b06174f0155e5.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:16 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160195 From: Bruce Ashfield Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 5915b0ea6746 Linux 5.4.159 abc49cc45d0a rsi: fix control-message timeout 64e6632ab4c1 media: staging/intel-ipu3: css: Fix wrong size comparison imgu_css_fw_init 6c382b63658e staging: rtl8192u: fix control-message timeouts f66258cb60e4 staging: r8712u: fix control-message timeout 88a252ff782c comedi: vmk80xx: fix bulk and interrupt message timeouts 1ae4715121a5 comedi: vmk80xx: fix bulk-buffer overflow 199acd8c110e comedi: vmk80xx: fix transfer-buffer overflows b0156b7c9649 comedi: ni_usb6501: fix NULL-deref in command paths 3efb7af8ac43 comedi: dt9812: fix DMA buffers on stack 6e80e9314f8b isofs: Fix out of bound access for corrupted isofs image adc56dbfc4aa printk/console: Allow to disable console output by using console="" or console=null 589ac131b3ab binder: don't detect sender/target during buffer cleanup b60e89b63eb9 usb-storage: Add compatibility quirk flags for iODD 2531/2541 5c3eba290479 usb: musb: Balance list entry in musb_gadget_queue 161571745de1 usb: gadget: Mark USB_FSL_QE broken on 64-bit d6013265a779 usb: ehci: handshake CMD_RUN instead of STS_HALT 6d000e1c1625 Revert "x86/kvm: fix vcpu-id indexed array sizes" Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman (cherry picked from commit 9c37c738a645b472175b93431deb47b47a1442e7) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.4.bb | 6 ++--- .../linux/linux-yocto-tiny_5.4.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 6646315c0d..6db06b6281 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "1a91fd560dcf8fa9e49fc2f17cb37483201a2b89" -SRCREV_meta ?= "db8bfc3a107db2a059fb8efa442f7daa17e8d55c" +SRCREV_machine ?= "e0b42b387dce06a55169f213efd8796912778abc" +SRCREV_meta ?= "8feda7148db44cfaa3bcce84b7fda6dcedbfd443" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.158" +LINUX_VERSION ?= "5.4.159" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 836ea62d8f..f217718c7b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.158" +LINUX_VERSION ?= "5.4.159" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "9b7cd001c33ea463bbb23fda6a79900ffc88c484" -SRCREV_machine ?= "80849cd7ef3a77895f8651cec85648578bef9135" -SRCREV_meta ?= "db8bfc3a107db2a059fb8efa442f7daa17e8d55c" +SRCREV_machine_qemuarm ?= "7062d2dd2f5e5e7a07616accce62ddc5abb7b570" +SRCREV_machine ?= "2494d7c8a13b2ce2a41c7bbc8276b5f4f6e61ac1" +SRCREV_meta ?= "8feda7148db44cfaa3bcce84b7fda6dcedbfd443" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 41d1e593aa..85f5eb2549 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "414c50525aea1ec953cca6d050d5c23db04de269" -SRCREV_machine_qemuarm64 ?= "ba5e3380aa8a3789907c031beac2ce81d1eb5d50" -SRCREV_machine_qemumips ?= "177841cfef0bd71b7b4f0e2e8e2ea3100ee4ea7a" -SRCREV_machine_qemuppc ?= "c3b4b69caef59344d4a59a2327f9f0130db9ccbe" -SRCREV_machine_qemuriscv64 ?= "76404f1ae59698b6a446dba29c885ca78c69c330" -SRCREV_machine_qemux86 ?= "76404f1ae59698b6a446dba29c885ca78c69c330" -SRCREV_machine_qemux86-64 ?= "76404f1ae59698b6a446dba29c885ca78c69c330" -SRCREV_machine_qemumips64 ?= "75a3c9aeedd5a8070079d96d0301a303ca3351a8" -SRCREV_machine ?= "76404f1ae59698b6a446dba29c885ca78c69c330" -SRCREV_meta ?= "db8bfc3a107db2a059fb8efa442f7daa17e8d55c" +SRCREV_machine_qemuarm ?= "82eedda0c6efa661eccd57dc542c50bef054cb6f" +SRCREV_machine_qemuarm64 ?= "f0a7a9cbc8f42271f953e6a05b63a797620c8331" +SRCREV_machine_qemumips ?= "ca5eb4fc25d66165f42348c64c568193fc6407b6" +SRCREV_machine_qemuppc ?= "11fb8e44b3ffdc3bd7c8703f85f622265c815e69" +SRCREV_machine_qemuriscv64 ?= "74c0ef6fbb42f521a7ce02cf62bf9c54c57034e1" +SRCREV_machine_qemux86 ?= "74c0ef6fbb42f521a7ce02cf62bf9c54c57034e1" +SRCREV_machine_qemux86-64 ?= "74c0ef6fbb42f521a7ce02cf62bf9c54c57034e1" +SRCREV_machine_qemumips64 ?= "02faa48ca76a54e5da6e256b0621c09c7cf03051" +SRCREV_machine ?= "74c0ef6fbb42f521a7ce02cf62bf9c54c57034e1" +SRCREV_meta ?= "8feda7148db44cfaa3bcce84b7fda6dcedbfd443" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,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-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.158" +LINUX_VERSION ?= "5.4.159" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Wed Jan 5 15:18:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 14136 X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org From: "Anuj Mittal" Subject: [hardknott][PATCH 11/24] linux-yocto/5.4: update to v5.4.162 Date: Wed, 5 Jan 2022 23:18:31 +0800 Message-Id: <0b6f1b880781be547731ace0b585a90f4a6d5aca.1641395036.git.anuj.mittal@intel.com> In-Reply-To: References: MIME-Version: 1.0 List-id: To: openembedded-core@lists.openembedded.org From: Bruce Ashfield Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 9334f48f5673 Linux 5.4.162 46a8e16fcf2c ALSA: hda: hdac_stream: fix potential locking issue in snd_hdac_stream_assign() 293385739d68 ALSA: hda: hdac_ext_stream: fix potential locking issues 201340ca4eb7 hugetlbfs: flush TLBs correctly after huge_pmd_unshare e7891b22b251 tlb: mmu_gather: add tlb_flush_*_range APIs 10e34766d8ac ice: Delete always true check of PF pointer 101485e566ce usb: max-3421: Use driver data instead of maintaining a list of bound devices 4e1b3e718f24 ASoC: DAPM: Cover regression by kctl change notification fix 56a32c82761a batman-adv: Don't always reallocate the fragmentation skb head 08bceb1e30c2 batman-adv: Reserve needed_*room for fragments 374c55d416ab batman-adv: Consider fragmentation for needed_headroom 9eff9854f82d perf/core: Avoid put_page() when GUP fails e0122ea133cd Revert "net: mvpp2: disable force link UP during port init procedure" 4efa2509d3aa drm/amdgpu: fix set scaling mode Full/Full aspect/Center not works on vga and dvi connectors c0276de0be48 drm/i915/dp: Ensure sink rate values are always valid 1c4af56ffbfb drm/nouveau: use drm_dev_unplug() during device removal 9e98622aa508 drm/udl: fix control-message timeout 52affc201fc2 cfg80211: call cfg80211_stop_ap when switch from P2P_GO type ca9834a1148b parisc/sticon: fix reverse colors 670f6b3867c8 btrfs: fix memory ordering between normal and ordered work functions 1c3882215946 udf: Fix crash after seekdir f79957d274b0 s390/kexec: fix memory leak of ipl report buffer b0e44dfb4e4c x86/hyperv: Fix NULL deref in set_hv_tscchange_cb() if Hyper-V setup fails f2e0cd42f198 mm: kmemleak: slob: respect SLAB_NOLEAKTRACE flag 95de3703a1d0 ipc: WARN if trying to remove ipc object which is absent 8997bb6d1ecc hexagon: export raw I/O routines for modules 01a7ecd36d1e tun: fix bonding active backup with arp monitoring 7c8f778f0a3a arm64: vdso32: suppress error message for 'make mrproper' e636f65b3d8f s390/kexec: fix return code handling cc093e5a966d perf/x86/intel/uncore: Fix IIO event constraints for Skylake Server cc63a789d80d perf/x86/intel/uncore: Fix filter_tid mask for CHA events on Skylake Server 47a810817823 KVM: PPC: Book3S HV: Use GLOBAL_TOC for kvmppc_h_set_dabr/xdabr() 307d2e6cebfc NFC: reorder the logic in nfc_{un,}register_device da3a87eeb990 drm/nouveau: hdmigv100.c: fix corrupted HDMI Vendor InfoFrame e418bb556ff8 NFC: reorganize the functions in nci_request bbb8376d58ac i40e: Fix display error code in dmesg 69e5d27af579 i40e: Fix creation of first queue by omitting it if is not power of two 5564e9129f1f i40e: Fix ping is lost after configuring ADq on VF 8509178dc001 i40e: Fix changing previously set num_queue_pairs for PFs c30162da9132 i40e: Fix NULL ptr dereference on VSI filter sync 0a0308af22a5 i40e: Fix correct max_pkt_size on VF RX queue fb2dbc124a7f net: virtio_net_hdr_to_skb: count transport header in UFO d74ff10ed2d9 net: dpaa2-eth: fix use-after-free in dpaa2_eth_remove 8b2c66b0f2a0 net: sched: act_mirred: drop dst for the direction from egress to ingress edd783162bf2 scsi: core: sysfs: Fix hang when device state is set via sysfs 446882f216ac platform/x86: hp_accel: Fix an error handling path in 'lis3lv02d_probe()' 453b5b614b93 mips: lantiq: add support for clk_get_parent() 477653f3e4e4 mips: bcm63xx: add support for clk_get_parent() 426fed211b49 MIPS: generic/yamon-dt: fix uninitialized variable error 67334abd4fb7 iavf: Fix for the false positive ASQ/ARQ errors while issuing VF reset 98f3badc414f iavf: validate pointers 92cecf349121 iavf: prevent accidental free of filter structure 63f032a956ed iavf: Fix failure to exit out from last all-multicast mode 926e8c83d4c1 iavf: free q_vectors before queues in iavf_disable_vf f0222e7eee0c iavf: check for null in iavf_fix_features b5638bc64a69 net: bnx2x: fix variable dereferenced before check fbba0692ec4b perf tests: Remove bash construct from record+zstd_comp_decomp.sh 9e0df711f8db perf bench futex: Fix memory leak of perf_cpu_map__new() 642fc22210a5 perf bpf: Avoid memory leak from perf_env__insert_btf() 6bf5523090a7 RDMA/netlink: Add __maybe_unused to static inline in C file ef82c3716a5a tracing/histogram: Do not copy the fixed-size char array field over the field size 80b777606925 tracing: Save normal string variables 8928e31a776a sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain() a93a58bae950 mips: BCM63XX: ensure that CPU_SUPPORTS_32BIT_KERNEL is set 05311b9192be clk: qcom: gcc-msm8996: Drop (again) gcc_aggre1_pnoc_ahb_clk ee1317e1f4b0 clk/ast2600: Fix soc revision for AHB d6c32b4c83f6 clk: ingenic: Fix bugs with divided dividers 982d31ba5533 sh: define __BIG_ENDIAN for math-emu 214cd15d3675 sh: math-emu: drop unused functions 3d774e776f68 sh: fix kconfig unmet dependency warning for FRAME_POINTER 7727659e45f8 f2fs: fix up f2fs_lookup tracepoints d7c612f6b1f3 maple: fix wrong return value of maple_bus_init(). 9823ba8f17f8 sh: check return code of request_irq 94292e4577a2 powerpc/dcr: Use cmplwi instead of 3-argument cmpli c6d2cefdd05c ALSA: gus: fix null pointer dereference on pointer block 513543f1eda1 powerpc/5200: dts: fix memory node unit name 3a9eae47a550 iio: imu: st_lsm6dsx: Avoid potential array overflow in st_lsm6dsx_set_odr() a3ecee8a8fd7 scsi: target: Fix alua_tg_pt_gps_count tracking 14934afd4f5d scsi: target: Fix ordered tag handling 1ab3b4f4f46f MIPS: sni: Fix the build d491c84df5c4 tty: tty_buffer: Fix the softlockup issue in flush_to_ldisc 80709beddb8d ALSA: ISA: not for M68K 2f8cda43c415 ARM: dts: ls1021a-tsn: use generic "jedec,spi-nor" compatible for flash 723c1af01c35 ARM: dts: ls1021a: move thermal-zones node out of soc/ f98986b7acb4 usb: host: ohci-tmio: check return value after calling platform_get_resource() e187c2f3f25e ARM: dts: omap: fix gpmc,mux-add-data type 3b9d8d3e4af2 firmware_loader: fix pre-allocated buf built-in firmware use cc248790bfdc scsi: advansys: Fix kernel pointer leak bcc1eac0bd49 ASoC: nau8824: Add DMI quirk mechanism for active-high jack-detect c9428e13417d clk: imx: imx6ul: Move csi_sel mux to correct base register e5f8c43c8546 ASoC: SOF: Intel: hda-dai: fix potential locking issue cb074c00b71a arm64: dts: freescale: fix arm,sp805 compatible string a14d7038ea20 arm64: dts: qcom: msm8998: Fix CPU/L2 idle state latency and residency 30dcfcda8992 usb: typec: tipd: Remove WARN_ON in tps6598x_block_read 3ee15f1af174 usb: musb: tusb6010: check return value after calling platform_get_resource() ba9579f832bd RDMA/bnxt_re: Check if the vlan is valid before reporting bf6a633b0736 arm64: dts: hisilicon: fix arm,sp805 compatible string 16bcbfb56d75 scsi: lpfc: Fix list_add() corruption in lpfc_drain_txq() 51c94d6aee59 ARM: dts: NSP: Fix mpcore, mmc node names 1390f32ea964 arm64: zynqmp: Fix serial compatible string 31df0f0f1882 arm64: zynqmp: Do not duplicate flash partition label property 5c088fba39af Linux 5.4.161 b786cb3236e1 erofs: fix unsafe pagevec reuse of hooked pclusters 83de35ae27a1 erofs: remove the occupied parameter from z_erofs_pagevec_enqueue() b37f6da8c3fc PCI: Add MSI masking quirk for Nvidia ION AHCI db1390b60e89 PCI/MSI: Deal with devices lying about their MSI mask capability 49b55a7792ec PCI/MSI: Destroy sysfs before freeing entries 7186be970c11 parisc/entry: fix trace test in syscall exit path 258c42a8fb31 fortify: Explicitly disable Clang support 4f9a3cda1660 scsi: ufs: Fix tm request when non-fatal error happens c468f9249d84 ext4: fix lazy initialization next schedule time computation in more granular unit 307c6f728728 MIPS: Fix assembly error from MIPSr2 code used within MIPS_ISA_ARCH_LEVEL 7be773a0288e scsi: ufs: Fix interrupt error message for shared interrupts e3c97ba4a69e soc/tegra: pmc: Fix imbalanced clock disabling in error code path 17efa1a44c7f Linux 5.4.160 66bd28d6be90 selftests/bpf: Fix also no-alu32 strobemeta selftest e7ea088cd030 ath10k: fix invalid dma_addr_t token assignment 20a951afb7d5 SUNRPC: Partial revert of commit 6f9f17287e78 5b7a0a4f7cbe PCI: Add PCI_EXP_DEVCTL_PAYLOAD_* macros 256a1e009b9b powerpc/powernv/prd: Unregister OPAL_MSG_PRD2 notifier during module unload fe02d37870c9 s390/cio: make ccw_device_dma_* more robust 8a8d007bae0e s390/tape: fix timer initialization in tape_std_assign() 5ef14af16629 s390/cio: check the subchannel validity for dev_busid b0989ae51d01 video: backlight: Drop maximum brightness override for brightness zero 66938ba12857 mm, oom: do not trigger out_of_memory from the #PF d6648b55ed39 mm, oom: pagefault_out_of_memory: don't force global OOM for dying tasks c6f9a5c11a91 powerpc/bpf: Emit stf barrier instruction sequences for BPF_NOSPEC 453b779d2b8f powerpc/security: Add a helper to query stf_barrier type 84b3fbfd8ed8 powerpc/bpf: Fix BPF_SUB when imm == 0x80000000 7edda4bd9eb9 powerpc/bpf: Validate branch ranges 0347c001c909 powerpc/lib: Add helper to check if offset is within conditional branch range c4461ca7a835 ovl: fix deadlock in splice write 8d750efc8dd6 9p/net: fix missing error check in p9_check_errors aba12bb38b10 net, neigh: Enable state migration between NUD_PERMANENT and NTF_USE 223985fa1b5f f2fs: should use GFP_NOFS for directory inodes af73b240e09e irqchip/sifive-plic: Fixup EOI failed when masked 53014c1c4162 parisc: Fix set_fixmap() on PA1.x CPUs 645d6dfdcb0b parisc: Fix backtrace to always include init funtion names 62c4e0a3d81a ARM: 9156/1: drop cc-option fallbacks for architecture selection 61a5e446bbff ARM: 9155/1: fix early early_iounmap() dc3357424610 selftests/net: udpgso_bench_rx: fix port argument dd3a418ba5e6 cxgb4: fix eeprom len when diagnostics not implemented 1800c9eecd5e net/smc: fix sk_refcnt underflow on linkdown and fallback b2d1b6624bde vsock: prevent unnecessary refcnt inc for nonblocking connect 72aca95f958e net: hns3: allow configure ETS bandwidth of all TCs 07b218db54a4 net/sched: sch_taprio: fix undefined behavior in ktime_mono_to_any 18f2809441ef bpf: sockmap, strparser, and tls are reusing qdisc_skb_cb and colliding 180a9b539cf6 arm64: pgtable: make __pte_to_phys/__phys_to_pte_val inline functions 572599cbf17a nfc: pn533: Fix double free when pn533_fill_fragment_skbs() fails c1d5f943bbc3 llc: fix out-of-bound array index in llc_sk_dev_hash() bdf94057aae6 perf bpf: Add missing free to bpf_event__print_bpf_prog_info() 23def86bbf71 zram: off by one in read_block_state() d26835de40db mm/zsmalloc.c: close race window between zs_pool_dec_isolated() and zs_unregister_migration() 46d695e870c4 bonding: Fix a use-after-free problem when bond_sysfs_slave_add() failed dce69e0a065d ACPI: PMIC: Fix intel_pmic_regs_handler() read accesses 700602b662d7 net: vlan: fix a UAF in vlan_dev_real_dev() 98e0ab88f435 net: davinci_emac: Fix interrupt pacing disable 70ecaadb49c2 xen-pciback: Fix return in pm_ctrl_init() 7f57b9bc8ee6 i2c: xlr: Fix a resource leak in the error handling path of 'xlr_i2c_probe()' 53ad06ff3b4e NFSv4: Fix a regression in nfs_set_open_stateid_locked() c9dcb51ae473 scsi: qla2xxx: Turn off target reset during issue_lip 211f08d1ffc8 scsi: qla2xxx: Fix gnl list corruption 9b180f3c2d92 ar7: fix kernel builds for compiler test 59e97c74d159 watchdog: f71808e_wdt: fix inaccurate report in WDIOC_GETTIMEOUT 162a1cfcd5ca m68k: set a default value for MEMORY_RESERVE 9770f8c29f81 signal/sh: Use force_sig(SIGKILL) instead of do_group_exit(SIGKILL) 9e6985190f04 dmaengine: dmaengine_desc_callback_valid(): Check for `callback_result` fd1de3590123 netfilter: nfnetlink_queue: fix OOB when mac header was cleared 15351d5e8bb4 soc: fsl: dpaa2-console: free buffer before returning from dpaa2_console_read be832f781dc4 auxdisplay: ht16k33: Fix frame buffer device blanking c441943075fd auxdisplay: ht16k33: Connect backlight to fbdev 1fa9803de9e3 auxdisplay: img-ascii-lcd: Fix lock-up when displaying empty string e63507ea4369 dmaengine: at_xdmac: fix AT_XDMAC_CC_PERID() macro 04317e74745a mtd: core: don't remove debugfs directory if device is in use 59929f9a573a mtd: spi-nor: hisi-sfc: Remove excessive clk_disable_unprepare() a83aaf15077e fs: orangefs: fix error return code of orangefs_revalidate_lookup() c79c37c77550 NFS: Fix deadlocks in nfs_scan_commit_list() 5a893e0eab16 opp: Fix return in _opp_add_static_v2() 98ac69821650 PCI: aardvark: Fix preserving PCI_EXP_RTCTL_CRSSVE flag on emulated bridge 819925eff0c5 PCI: aardvark: Don't spam about PIO Response Status bab1cfec7ae2 drm/plane-helper: fix uninitialized variable reference 4b48c6ede329 pnfs/flexfiles: Fix misplaced barrier in nfs4_ff_layout_prepare_ds 2b2fdb6f4892 rpmsg: Fix rpmsg_create_ept return when RPMSG config is not defined bd48bdbfd9c4 apparmor: fix error check a7b294764945 power: supply: bq27xxx: Fix kernel crash on IRQ handler register error 3f698d97f7c5 mips: cm: Convert to bitfield API to fix out-of-bounds access fb7b73cd9418 powerpc/44x/fsp2: add missing of_node_put d3dd1a057c9a HID: u2fzero: properly handle timeouts in usb_submit_urb b216a39b3212 HID: u2fzero: clarify error check and length calculations fae0552d83ff serial: xilinx_uartps: Fix race condition causing stuck TX 818e100c2bf4 phy: qcom-qusb2: Fix a memory leak on probe de43e75917bc ASoC: cs42l42: Defer probe if request_threaded_irq() returns EPROBE_DEFER f00ff5357b61 ASoC: cs42l42: Correct some register default values baf5c1225eb2 ARM: dts: stm32: fix SAI sub nodes register range bb74ce1feb36 staging: ks7010: select CRYPTO_HASH/CRYPTO_MICHAEL_MIC 73aaa6222ac7 RDMA/mlx4: Return missed an error if device doesn't support steering 20dfad97dbd6 scsi: csiostor: Uninitialized data in csio_ln_vnp_read_cbfn() 5ead6f4feaa7 power: supply: rt5033_battery: Change voltage values to µV fdbe8e8a08bf usb: gadget: hid: fix error code in do_config() 15355466cded serial: 8250_dw: Drop wrong use of ACPI_PTR() d8241e7a2144 video: fbdev: chipsfb: use memset_io() instead of memset() e7df004eb14e clk: at91: check pmc node status before registering syscore ops 44a2dcd146dc memory: fsl_ifc: fix leak of irq and nand_irq in fsl_ifc_ctrl_probe 03fe35ce9a0e soc/tegra: Fix an error handling path in tegra_powergate_power_up() 543d85602f9c arm: dts: omap3-gta04a4: accelerometer irq fix 7cf7d9b83d79 ALSA: hda: Reduce udelay() at SKL+ position reporting d1cf71d79e00 JFS: fix memleak in jfs_mount 56911ee5375f MIPS: loongson64: make CPU_LOONGSON64 depends on MIPS_FP_SUPPORT ee49b6598cfb scsi: dc395: Fix error case unwinding dd49dee254db ARM: dts: at91: tse850: the emac<->phy interface is rmii 1df7102f265b arm64: dts: meson-g12a: Fix the pwm regulator supply properties 681c58f34434 RDMA/bnxt_re: Fix query SRQ failure 50eca29537b0 ARM: dts: qcom: msm8974: Add xo_board reference clock to DSI0 PHY 863e71a3afb7 arm64: dts: rockchip: Fix GPU register width for RK3328 6694960195b7 ARM: s3c: irq-s3c24xx: Fix return value check for s3c24xx_init_intc() d27580c1b027 clk: mvebu: ap-cpu-clk: Fix a memory leak in error handling paths 9212ebb1c6d8 RDMA/rxe: Fix wrong port_cap_flags cf234bc5fbd8 ibmvnic: Process crqs after enabling interrupts bc4061648176 ibmvnic: don't stop queue in xmit a91c8ee2ed84 udp6: allow SO_MARK ctrl msg to affect routing 9ff14503f498 selftests/bpf: Fix fclose/pclose mismatch in test_progs af51aa2b8586 crypto: pcrypt - Delay write to padata->info 9be9cb2a2be4 net: phylink: avoid mvneta warning when setting pause parameters 077410c7907c net: amd-xgbe: Toggle PLL settings during rate change 63a3b1af0474 drm/amdgpu/gmc6: fix DMA mask from 44 to 40 bits 9ca0d107428b wcn36xx: add proper DMA memory barriers in rx path a3256ae45b0d libertas: Fix possible memory leak in probe and disconnect 427583b93d5a libertas_tf: Fix possible memory leak in probe and disconnect 2339ff4162a6 KVM: s390: Fix handle_sske page fault handling 3f3b4054e214 samples/kretprobes: Fix return value if register_kretprobe() failed 9435b2f9c006 tcp: don't free a FIN sk_buff in tcp_remove_empty_skb() a8226599cbab irq: mips: avoid nested irq_enter() ae5a24464872 s390/gmap: don't unconditionally call pte_unmap_unlock() in __gmap_zap() 8fb436d146c7 libbpf: Fix BTF data layout checks and allow empty BTF 03a818c09677 smackfs: use netlbl_cfg_cipsov4_del() for deleting cipso_v4_doi 12ccb5737925 drm/msm: Fix potential NULL dereference in DPU SSPP dc18f0806297 clocksource/drivers/timer-ti-dm: Select TIMER_OF c523474f2a45 PM: hibernate: fix sparse warnings 0d22f55014d2 nvme-rdma: fix error code in nvme_rdma_setup_ctrl 67ba6c8e715f phy: micrel: ksz8041nl: do not use power down mode ae213c059a8b mwifiex: Send DELBA requests according to spec 3a781e213164 rsi: stop thread firstly in rsi_91x_init() error handling ad4cd0130757 mt76: mt76x02: fix endianness warnings in mt76x02_mac.c bdbc9311f10f platform/x86: thinkpad_acpi: Fix bitwise vs. logical warning 3446e5ecdf91 block: ataflop: fix breakage introduced at blk-mq refactoring 2918a29fc8ba mmc: mxs-mmc: disable regulator on error and in the remove function b631c603b5fb net: stream: don't purge sk_error_queue in sk_stream_kill_queues() f27fbff86280 drm/msm: uninitialized variable in msm_gem_import() 32ac072c24b5 ath10k: fix max antenna gain unit 218fb43ffff0 hwmon: (pmbus/lm25066) Let compiler determine outer dimension of lm25066_coeff 8384c4a7bcb3 hwmon: Fix possible memleak in __hwmon_device_register() f7fd072039d6 net, neigh: Fix NTF_EXT_LEARNED in combination with NTF_USE 9498f5272a44 memstick: jmb38x_ms: use appropriate free function in jmb38x_ms_alloc_host() 5f462b38ce7a memstick: avoid out-of-range warning 3a7525d5d7bf mmc: sdhci-omap: Fix NULL pointer exception if regulator is not configured dc73f7cae11d b43: fix a lower bounds test 1b6365fdae77 b43legacy: fix a lower bounds test c51ac7fd0256 hwrng: mtk - Force runtime pm ops for sleep ops 52d2cdab5288 crypto: qat - disregard spurious PFVF interrupts 4d7881430ffb crypto: qat - detect PFVF collision after ACK a3d3f9c5dca3 media: dvb-frontends: mn88443x: Handle errors of clk_prepare_enable() 73dd601bec0d netfilter: nft_dynset: relax superfluous check on set updates 62f6260f7065 EDAC/amd64: Handle three rank interleaving mode f399e650c095 ath9k: Fix potential interrupt storm on queue reset 843ff688eb83 media: em28xx: Don't use ops->suspend if it is NULL e577924b7021 cpuidle: Fix kobject memory leaks in error paths 18fdbdbecf72 crypto: ecc - fix CRYPTO_DEFAULT_RNG dependency a993159a2ad0 kprobes: Do not use local variable when creating debugfs file 71411bd79e24 media: cx23885: Fix snd_card_free call on null card pointer 1c2c8030e7eb media: tm6000: Avoid card name truncation 61266f852fb5 media: si470x: Avoid card name truncation 4e65b9ec2158 media: radio-wl1273: Avoid card name truncation 8eeec127d5cf media: mtk-vpu: Fix a resource leak in the error handling path of 'mtk_vpu_probe()' 2b9ae7bac92e media: TDA1997x: handle short reads of hdmi info frame. 23b65152a069 media: dvb-usb: fix ununit-value in az6027_rc_query e2b2d221a446 media: cxd2880-spi: Fix a null pointer dereference on error handling path f46da0c6af3a media: em28xx: add missing em28xx_close_extension 14f3d77c770d drm/amdgpu: fix warning for overflow check 465dc8a1b1c1 ath10k: Fix missing frame timestamp for beacon/probe-resp 7c12c2fe4568 net: dsa: rtl8366rb: Fix off-by-one bug 674637270edd rxrpc: Fix _usecs_to_jiffies() by using usecs_to_jiffies() d4cd7a167c87 crypto: caam - disable pkc for non-E SoCs 555fe5734d39 Bluetooth: btmtkuart: fix a memleak in mtk_hci_wmt_sync 8c68d12f1a37 wilc1000: fix possible memory leak in cfg_scan_result() 1713b856345d cgroup: Make rebind_subsystems() disable v2 controllers all at once bd76ec43f14e net: net_namespace: Fix undefined member in key_remove_domain() 3a37742128ea virtio-gpu: fix possible memory allocation failure 606c95078a4e drm/v3d: fix wait for TMU write combiner flush 6a93d8ebb8aa rcu: Fix existing exp request check in sync_sched_exp_online_cleanup() 6237a1685c28 Bluetooth: fix init and cleanup of sco_conn.timeout_work 28c1d965622f selftests/bpf: Fix strobemeta selftest regression f2c04d46c8de netfilter: conntrack: set on IPS_ASSURED if flows enters internal stream state 0c2acfede5ac parisc/kgdb: add kgdb_roundup() to make kgdb work with idle polling cbe28724277c parisc/unwind: fix unwinder when CONFIG_64BIT is enabled a9a411adcac8 task_stack: Fix end_of_stack() for architectures with upwards-growing stack c06cf3b1d049 parisc: fix warning in flush_tlb_all 732441923321 x86/hyperv: Protect set_hv_tscchange_cb() against getting preempted ad67a7e2ab13 spi: bcm-qspi: Fix missing clk_disable_unprepare() on error in bcm_qspi_probe() a15fc58933aa btrfs: do not take the uuid_mutex in btrfs_rm_device aba1db41dde7 net: annotate data-race in neigh_output() 2f78cb7eccb6 vrf: run conntrack only in context of lower/physdev for locally generated packets 5919f02e185b ARM: 9136/1: ARMv7-M uses BE-8, not BE-32 d99f320a1b7e gre/sit: Don't generate link-local addr if addr_gen_mode is IN6_ADDR_GEN_MODE_NONE 9929b3db46c9 ARM: clang: Do not rely on lr register for stacktrace 681a426e6ba4 smackfs: use __GFP_NOFAIL for smk_cipso_doi() 4752a9c3a079 iwlwifi: mvm: disable RX-diversity in powersave 41e583edb1d2 selftests: kvm: fix mismatched fclose() after popen() 4411d0d8df2b PM: hibernate: Get block device exclusively in swsusp_check() a528d3aac3ef nvme: drop scan_lock and always kick requeue list when removing namespaces 209c39b3f5e9 nvmet-tcp: fix use-after-free when a port is removed 81d11e40fdbb nvmet: fix use-after-free when a port is removed 1ec1ca2be9c6 block: remove inaccurate requeue check bfde056402c7 mwl8k: Fix use-after-free in mwl8k_fw_state_machine() e4af3e42ba1e tracing/cfi: Fix cmp_entries_* functions signature mismatch caeb6bae7553 workqueue: make sysfs of unbound kworker cpumask more clever 58b4e0c075d5 lib/xz: Validate the value before assigning it to an enum variable 8cdab20660f0 lib/xz: Avoid overlapping memcpy() with invalid input with in-place decompression eb8f087201b5 memstick: r592: Fix a UAF bug when removing the driver 2226ad031436 leaking_addresses: Always print a trailing newline 63c3c7b699d2 ACPI: battery: Accept charges over the design capacity as full 2efb81b22d2d iov_iter: Fix iov_iter_get_pages{,_alloc} page fault return value d5fb057f2364 ath: dfs_pattern_detector: Fix possible null-pointer dereference in channel_detector_create() e2c27194fcd9 tracefs: Have tracefs directories not set OTH permission bits by default ace6e7fe9645 net-sysfs: try not to restart the syscall if it will fail eventually d8d1d3540561 media: usb: dvd-usb: fix uninit-value bug in dibusb_read_eeprom_byte() 382e7b6458e4 media: ipu3-imgu: VIDIOC_QUERYCAP: Fix bus_info e5f9be486976 media: ipu3-imgu: imgu_fmt: Handle properly try cdf338e1dbf1 ACPICA: Avoid evaluating methods too early during system resume 9ff00d0b1d35 ipmi: Disable some operations during a panic 4bba26f89e66 media: rcar-csi2: Add checking to rcsi2_start_receiver() c08a655ed938 brcmfmac: Add DMI nvram filename quirk for Cyberbook T116 tablet f64551db5299 ia64: don't do IA64_CMPXCHG_DEBUG without CONFIG_PRINTK 31b784864736 media: mceusb: return without resubmitting URB in case of -EPROTO error. e419469adfd4 media: imx: set a media_device bus_info string b2b2f9178250 media: s5p-mfc: Add checking to s5p_mfc_probe(). 6b8ab552e24c media: s5p-mfc: fix possible null-pointer dereference in s5p_mfc_probe() bc4af8c782eb media: uvcvideo: Set unique vdev name based in type 7a646855d6a0 media: uvcvideo: Return -EIO for control errors ab7fca0eaefb media: uvcvideo: Set capability in s_param bff0833e2b7a media: stm32: Potential NULL pointer dereference in dcmi_irq_thread() cede36511c3b media: netup_unidvb: handle interrupt properly according to the firmware 3fe3d04354ae media: mt9p031: Fix corrupted frame after restarting stream 08743f9c4801 ath10k: high latency fixes for beacon buffer fadb4cd750f4 mwifiex: Properly initialize private structure on interface type changes 7d3e6635c22a mwifiex: Run SET_BSS_MODE when changing from P2P to STATION vif-type 480c240ab6df x86: Increase exception stack sizes 91b9c23b6d5b smackfs: Fix use-after-free in netlbl_catmap_walk() 31df731c8705 net: sched: update default qdisc visibility after Tx queue cnt changes a82f379378ab locking/lockdep: Avoid RCU-induced noinstr fail f14eca60bf23 MIPS: lantiq: dma: reset correct number of channel ca07aff2575d MIPS: lantiq: dma: add small delay after reset e5ea3dca9497 platform/x86: wmi: do not fail if disabling fails b57df4d6fc13 drm/panel-orientation-quirks: add Valve Steam Deck 67bd269a84ce Bluetooth: fix use-after-free error in lock_sock_nested() d416020f1a9c Bluetooth: sco: Fix lock_sock() blockage by memcpy_from_msg() a52bd11b2410 drm: panel-orientation-quirks: Add quirk for the Samsung Galaxy Book 10.6 e5ca76568a61 drm: panel-orientation-quirks: Add quirk for KD Kurio Smart C15200 2-in-1 c19cabfa5537 drm: panel-orientation-quirks: Update the Lenovo Ideapad D330 quirk (v2) 46a25b7a25a0 dma-buf: WARN on dmabuf release with pending attachments 1bee9e59c67b USB: chipidea: fix interrupt deadlock 8a643c0f95e8 USB: iowarrior: fix control-message timeouts 32858116748e USB: serial: keyspan: fix memleak on probe errors 8ce0bc6962df iio: dac: ad5446: Fix ad5622_write() return value f01e16d32495 pinctrl: core: fix possible memory leak in pinctrl_enable() 270541cbc056 quota: correct error number in free_dqentry() 10b808307d37 quota: check block number when reading the block in quota file a509a515f378 PCI: aardvark: Read all 16-bits from PCIE_MSI_PAYLOAD_REG 0ea58b9bb9cf PCI: aardvark: Fix return value of MSI domain .alloc() method ee9cdca4d61b PCI: aardvark: Fix reporting Data Link Layer Link Active 6f99c7a51e0a PCI: aardvark: Do not unmask unused interrupts d964886327ba PCI: aardvark: Fix checking for link up via LTSSM state e0269c0c81b8 PCI: aardvark: Do not clear status bits of masked interrupts 50b0ce94fbcc PCI: pci-bridge-emul: Fix emulation of W1C bits 3d995568c9bb xen/balloon: add late_initcall_sync() for initial ballooning done 3f6255a91bf3 ALSA: mixer: fix deadlock in snd_mixer_oss_set_volume 6225a31b2eb6 ALSA: mixer: oss: Fix racy access to slots e9adf72bdbd5 serial: core: Fix initializing and restoring termios speed b535b634645f powerpc/85xx: Fix oops when mpc85xx_smp_guts_ids node cannot be found bfefc5d6f953 can: j1939: j1939_can_recv(): ignore messages with invalid source address 94a3f521e3b6 can: j1939: j1939_tp_cmd_recv(): ignore abort message in the BAM transport 8e61c799c81e KVM: nVMX: Query current VMCS when determining if MSR bitmaps are in use 654a8248169e power: supply: max17042_battery: use VFSOC for capacity when no rsns 11129762e31a power: supply: max17042_battery: Prevent int underflow in set_soc_threshold 625c3ed247e1 signal/mips: Update (_save|_restore)_fp_context to fail with -EFAULT ec5ef8d4d795 signal: Remove the bogus sigkill_pending in ptrace_stop 28c70d50363d RDMA/qedr: Fix NULL deref for query_qp on the GSI QP 91a29609bd6f rsi: Fix module dev_oper_mode parameter description 9defe9b1ab34 rsi: fix rate mask set leading to P2P failure 2f1f06be3eb5 rsi: fix key enabled check causing unwanted encryption for vap_id > 0 1fa1da8a60ff rsi: fix occasional initialisation failure with BT coex 398e7e5add0c wcn36xx: handle connection loss indication 4a67355383f3 libata: fix checking of DMA state 6f2f91b9df15 mwifiex: Read a PCI register after writing the TX ring write pointer 3991cdc40fc1 wcn36xx: Fix HT40 capability for 2Ghz band 301d33c95441 evm: mark evm_fixmode as __ro_after_init e1f71a32899a rtl8187: fix control-message timeouts 76d2ce7ca9dc PCI: Mark Atheros QCA6174 to avoid bus reset 3110371c7af6 ath10k: fix division by zero in send path 2b94d10056f9 ath10k: fix control-message timeout cfbe74d8b131 ath6kl: fix control-message timeout 1a2fe1c3d87f ath6kl: fix division by zero in send path 78ebff828a33 mwifiex: fix division by zero in fw download path 08501eb9ff6a EDAC/sb_edac: Fix top-of-high-memory value for Broadwell/Haswell a147922924ab regulator: dt-bindings: samsung,s5m8767: correct s5m8767,pmic-buck-default-dvs-idx property c9e5a005960b regulator: s5m8767: do not use reset value as DVS voltage if GPIO DVS is disabled 3baa5886d128 hwmon: (pmbus/lm25066) Add offset coefficients 98bea923793f ia64: kprobes: Fix to pass correct trampoline address to the handler ddb54bf3b764 btrfs: call btrfs_check_rw_degradable only if there is a missing device 5223324ed1a9 btrfs: fix lost error handling when replaying directory deletes c25984fa182f btrfs: clear MISSING device status bit in btrfs_close_one_device 87a87c82f7f3 net/smc: Correct spelling mistake to TCPF_SYN_RECV cc14499b9dde nfp: bpf: relax prog rejection for mtu check through max_pkt_offset a62d43084165 vmxnet3: do not stop tx queues after netif_device_detach() 17dcecf20ce7 r8169: Add device 10ec:8162 to driver r8169 e84b38e57821 nvmet-tcp: fix header digest verification 2804181e1b91 drm: panel-orientation-quirks: Add quirk for GPD Win3 7273488fd373 watchdog: Fix OMAP watchdog early handling 5ffdddcf28a1 net: multicast: calculate csum of looped-back and forwarded packets 9420e2496d45 spi: spl022: fix Microwire full duplex mode 1a667bc32918 nvmet-tcp: fix a memory leak when releasing a queue 2f3860ba601a xen/netfront: stop tx queues during live migration de649ec7ad84 bpf: Prevent increasing bpf_jit_limit above max df8665c3983e bpf: Define bpf_jit_alloc_exec_limit for arm64 JIT 8dd688ba675a drm: panel-orientation-quirks: Add quirk for Aya Neo 2021 c4282bb80519 mmc: winbond: don't build on M68K 05f0a97e2ff7 reset: socfpga: add empty driver allowing consumers to probe dfa8fb782b52 ARM: dts: sun7i: A20-olinuxino-lime2: Fix ethernet phy-mode f09014e8bea8 hyperv/vmbus: include linux/bitops.h 054fe50d2654 sfc: Don't use netif_info before net_device setup 82005afbb30b cavium: Fix return values of the probe function 9f5fd5aab85f scsi: qla2xxx: Fix unmap of already freed sgl 96183337e97d scsi: qla2xxx: Return -ENOMEM if kzalloc() fails 8e3a0d28edb6 cavium: Return negative value when pci_alloc_irq_vectors() fails 58608e80d627 x86/irq: Ensure PI wakeup handler is unregistered before module unload 7252cb96e410 x86/cpu: Fix migration safety with X86_BUG_NULL_SEL e3d4ba338b98 x86/sme: Use #define USE_EARLY_PGTABLE_L5 in mem_encrypt_identity.c ccc4e5e60b41 fuse: fix page stealing 9505d4872188 ALSA: timer: Unconditionally unlink slave instances, too 2c6446168f07 ALSA: timer: Fix use-after-free problem 246c6a1fe356 ALSA: synth: missing check for possible NULL after the call to kstrdup ce9f7535ec26 ALSA: usb-audio: Add registration quirk for JBL Quantum 400 7da6f4c5c21c ALSA: line6: fix control and interrupt message timeouts 4a12e624e597 ALSA: 6fire: fix control and bulk message timeouts ab3f823af278 ALSA: ua101: fix division by zero at probe a3bb6e0db72b ALSA: hda/realtek: Add quirk for HP EliteBook 840 G7 mute LED 40243342d297 ALSA: hda/realtek: Add quirk for ASUS UX550VE 8af6ade7ac5e ALSA: hda/realtek: Add a quirk for Acer Spin SP513-54N 809416fe0a7a ALSA: hda/realtek: Add quirk for Clevo PC70HS 638b53d67ffc media: v4l2-ioctl: Fix check_ext_ctrls 8c11269bd619 media: ir-kbd-i2c: improve responsiveness of hauppauge zilog receivers bbd62d2fca94 media: ite-cir: IR receiver stop working after receive overflow eef6cb3d3c92 crypto: s5p-sss - Add error handling in s5p_aes_probe() d7a5d872b414 firmware/psci: fix application of sizeof to pointer 18f0fb57a9fe tpm: Check for integer overflow in tpm2_map_response_body() f38f3da360a6 parisc: Fix ptrace check on syscall return acbc2a08ea7c mmc: dw_mmc: Dont wait for DRTO on Write RSP error 5ee76475f82a scsi: qla2xxx: Fix use after free in eh_abort path cc5b13948838 scsi: qla2xxx: Fix kernel crash when accessing port_speed sysfs file 617d2fd48da5 ocfs2: fix data corruption on truncate c20eb9551c52 libata: fix read log timeout value 69c2199f49fb Input: i8042 - Add quirk for Fujitsu Lifebook T725 17ec1c6b45a7 Input: elantench - fix misreporting trackpoint coordinates ce4bec0a54a4 Input: iforce - fix control-message timeout db39f49ee7d5 binder: use cred instead of task for getsecid fc9c470cd519 binder: use cred instead of task for selinux checks 28a1e470b000 binder: use euid from cred instead of using task 3e87c4996de1 usb: xhci: Enable runtime-pm by default on AMD Yellow Carp platform 3fa7efd1fab1 xhci: Fix USB 3.1 enumeration issues by increasing roothub power-on-good delay Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman (cherry picked from commit 638171722cc6bfde01bf71a83af1a7c104ec54aa) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.4.bb | 6 ++--- .../linux/linux-yocto-tiny_5.4.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 6db06b6281..6cd1ede6ea 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "e0b42b387dce06a55169f213efd8796912778abc" -SRCREV_meta ?= "8feda7148db44cfaa3bcce84b7fda6dcedbfd443" +SRCREV_machine ?= "17e5e7a7f94d3d11d9d22fb6de614492596c0a8d" +SRCREV_meta ?= "51f40ce1f17bfdb31fb7bf4dd81f3b53bfd49fcc" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.159" +LINUX_VERSION ?= "5.4.162" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index f217718c7b..024ab77d08 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.159" +LINUX_VERSION ?= "5.4.162" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "7062d2dd2f5e5e7a07616accce62ddc5abb7b570" -SRCREV_machine ?= "2494d7c8a13b2ce2a41c7bbc8276b5f4f6e61ac1" -SRCREV_meta ?= "8feda7148db44cfaa3bcce84b7fda6dcedbfd443" +SRCREV_machine_qemuarm ?= "e3cbc4448222038ed98186783b61b099e35ef08d" +SRCREV_machine ?= "0c97af59c367809671cf25eed595e3fef21eb493" +SRCREV_meta ?= "51f40ce1f17bfdb31fb7bf4dd81f3b53bfd49fcc" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 85f5eb2549..cbcd167715 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "82eedda0c6efa661eccd57dc542c50bef054cb6f" -SRCREV_machine_qemuarm64 ?= "f0a7a9cbc8f42271f953e6a05b63a797620c8331" -SRCREV_machine_qemumips ?= "ca5eb4fc25d66165f42348c64c568193fc6407b6" -SRCREV_machine_qemuppc ?= "11fb8e44b3ffdc3bd7c8703f85f622265c815e69" -SRCREV_machine_qemuriscv64 ?= "74c0ef6fbb42f521a7ce02cf62bf9c54c57034e1" -SRCREV_machine_qemux86 ?= "74c0ef6fbb42f521a7ce02cf62bf9c54c57034e1" -SRCREV_machine_qemux86-64 ?= "74c0ef6fbb42f521a7ce02cf62bf9c54c57034e1" -SRCREV_machine_qemumips64 ?= "02faa48ca76a54e5da6e256b0621c09c7cf03051" -SRCREV_machine ?= "74c0ef6fbb42f521a7ce02cf62bf9c54c57034e1" -SRCREV_meta ?= "8feda7148db44cfaa3bcce84b7fda6dcedbfd443" +SRCREV_machine_qemuarm ?= "d787585d276bc42eb17f3b04ed8e1c36d51b3258" +SRCREV_machine_qemuarm64 ?= "87892857e00d1cdb6802abaea19cf65bee71da55" +SRCREV_machine_qemumips ?= "4f84fe187ca152aab43fa6008989a5d00cca6bdb" +SRCREV_machine_qemuppc ?= "4936240e37cfc88fe728add8ff3d9bd548c400ef" +SRCREV_machine_qemuriscv64 ?= "439da70d7184793365a45e83ec1b816fd0ec0afe" +SRCREV_machine_qemux86 ?= "439da70d7184793365a45e83ec1b816fd0ec0afe" +SRCREV_machine_qemux86-64 ?= "439da70d7184793365a45e83ec1b816fd0ec0afe" +SRCREV_machine_qemumips64 ?= "cef4f9fba704dba2cca97111ead9e579fde115c4" +SRCREV_machine ?= "439da70d7184793365a45e83ec1b816fd0ec0afe" +SRCREV_meta ?= "51f40ce1f17bfdb31fb7bf4dd81f3b53bfd49fcc" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,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-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.159" +LINUX_VERSION ?= "5.4.162" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Wed Jan 5 15:18:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2073 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 EF3C2C433F5 for ; Wed, 5 Jan 2022 15:19:20 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:19 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=XqMqMuBB; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395959; x=1672931959; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=W99RZPshpjABKG79vcQnsE5LnmBbjg0Kpro+Ra88GBE=; b=XqMqMuBBbi+pMAtzGyPtz5b8szHfgqcenQS20FYiOHyFcfJriprj3Ln1 0hqIba5zWQigEQeT0GSGLLBv80rDp1Gpfre8kDKuscg3AozFuWDS8ovAu wgVgTfVmmYmyqQ0lXZd2bH2NYWEDRLH4/GEh51BRkjjxLhNsBkFCQX+AH YUv+YLZb1J1qJ09+U+mCWm50BAfYvRLeL48XO2oCys39Akhkh3K3co9Uu JCSOY6BUiCIN19siWEJSjtxJ3wW7ykFdAe0RkqxC3FtXTGHh75GPA4Peu 20u4Zvnxb9dIdF7ckA5msrVW8yDjp3XY6gy49AJkSdHbZ31XReGBCUkGX g==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742816" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742816" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:19 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128656" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:18 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 12/24] linux-yocto/5.4: update to v5.4.163 Date: Wed, 5 Jan 2022 23:18:32 +0800 Message-Id: X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160197 From: Bruce Ashfield Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 57899c4e26bf Linux 5.4.163 6c728efe164f tty: hvc: replace BUG_ON() with negative return value c3024e1945fe xen/netfront: don't trust the backend response data blindly 828b1d3861a1 xen/netfront: disentangle tx_skb_freelist 5b757077dacd xen/netfront: don't read data from request on the ring page 5c374d830e1b xen/netfront: read response from backend only once 3456a07614b1 xen/blkfront: don't trust the backend response data blindly 6392f51a9d2e xen/blkfront: don't take local copy of a request from the ring page ce011335cb42 xen/blkfront: read response from backend only once 61826a7884cb xen: sync include/xen/interface/io/ring.h with Xen's newest version 54f682cd4849 fuse: release pipe buf after last use eff32973ecc3 NFC: add NCI_UNREG flag to eliminate the race 43788453983e shm: extend forced shm destroy to support objects from several IPC nses b23c0c4c9e0a s390/mm: validate VMA in PGSTE manipulation functions 3c9a213e0edb tracing: Check pid filtering when creating events dda227cccf14 vhost/vsock: fix incorrect used length reported to the guest 2eacc0acf6ea smb3: do not error on fsync when readonly 51be334da375 f2fs: set SBI_NEED_FSCK flag when inconsistent node block found 3ceecea047c2 net: mscc: ocelot: correctly report the timestamping RX filters in ethtool ee4e3f9d3dd7 net: mscc: ocelot: don't downgrade timestamping RX filters in SIOCSHWTSTAMP 0ea2e5497b8c net: hns3: fix VF RSS failed problem after PF enable multi-TCs 3b961640399b net/smc: Don't call clcsock shutdown twice when smc shutdown 5e44178864b3 net: vlan: fix underflow for the real_dev refcnt 296139e1de16 MIPS: use 3-level pgtable for 64KB page size on MIPS_VA_BITS_48 9f5838471aed igb: fix netpoll exit with traffic 25980820c4f0 nvmet: use IOCB_NOWAIT only if the filesystem supports it d54662a91faa tcp_cubic: fix spurious Hystart ACK train detections for not-cwnd-limited flows 562fe6a6d2c5 PM: hibernate: use correct mode for swsusp_close() 2654e6cfc483 net/ncsi : Add payload to be 32-bit aligned to fix dropped packets 080f6b694ef1 nvmet-tcp: fix incomplete data digest send 6c0ab2caa8d1 net/smc: Ensure the active closing peer first closes clcsock 7854de57be29 scsi: core: sysfs: Fix setting device state to SDEV_RUNNING 67a6f64a0c84 net: nexthop: release IPv6 per-cpu dsts when replacing a nexthop group cca61bb17042 net: ipv6: add fib6_nh_release_dsts stub ddd0518c1e09 nfp: checking parameter process for rx-usecs/tx-usecs is invalid b638eb32c64d ipv6: fix typos in __ip6_finish_output() 8029ced6d775 iavf: Prevent changing static ITR values if adaptive moderation is on 4374e414fcbf drm/vc4: fix error code in vc4_create_object() 7e324f734a91 scsi: mpt3sas: Fix kernel panic during drive powercycle test dc9eb93d5a0a ARM: socfpga: Fix crash with CONFIG_FORTIRY_SOURCE a078967dd34b NFSv42: Don't fail clone() unless the OP_CLONE operation failed ce50e97a06bd firmware: arm_scmi: pm: Propagate return value to caller 7360abf31ce0 net: ieee802154: handle iftypes as u32 4421a196fdaf ASoC: topology: Add missing rwsem around snd_ctl_remove() calls 76867d0cb83f ASoC: qdsp6: q6routing: Conditionally reset FrontEnd Mixer a848a22e9434 ARM: dts: BCM5301X: Add interrupt properties to GPIO node 03f7379e2c69 ARM: dts: BCM5301X: Fix I2C controller interrupt 17a763eab714 netfilter: ipvs: Fix reuse connection if RS weight is 0 fd7974c547ab proc/vmcore: fix clearing user buffer by properly using clear_user() 66d6eacba7a6 arm64: dts: marvell: armada-37xx: Set pcie_reset_pin to gpio function 3a4baf070c6a pinctrl: armada-37xx: Correct PWM pins definitions 086226048bcd PCI: aardvark: Fix support for PCI_BRIDGE_CTL_BUS_RESET on emulated bridge 7c517d7b8898 PCI: aardvark: Set PCI Bridge Class Code to PCI Bridge 44b2776a9307 PCI: aardvark: Fix support for bus mastering and PCI_COMMAND on emulated bridge bbc6201152fb PCI: aardvark: Fix link training 3d770a20950b PCI: aardvark: Simplify initialization of rootcap on virtual bridge a06ace0d317d PCI: aardvark: Implement re-issuing config requests on CRS response 75faadcc3a0e PCI: aardvark: Fix PCIe Max Payload Size setting c697885a1281 PCI: aardvark: Configure PCIe resources from 'ranges' DT property e3c51ac70aae PCI: pci-bridge-emul: Fix array overruns, improve safety ea6eef03dafb PCI: aardvark: Update comment about disabling link training fe8a8c3a408e PCI: aardvark: Move PCIe reset card code to advk_pcie_train_link() 14311e77c93e PCI: aardvark: Fix compilation on s390 93491c5d26f7 PCI: aardvark: Don't touch PCIe registers if no card connected 8b0f7b8b7839 PCI: aardvark: Replace custom macros by standard linux/pci_regs.h macros e090b2e2708e PCI: aardvark: Issue PERST via GPIO 0ad291db2d01 PCI: aardvark: Improve link training 063a98c00528 PCI: aardvark: Train link immediately after enabling training bbe213fd12fb PCI: aardvark: Fix big endian support 5551081d845e PCI: aardvark: Wait for endpoint to be ready before training link 65d962199b7f PCI: aardvark: Deduplicate code in advk_pcie_rd_conf() 57c7d46e8b1d mdio: aspeed: Fix "Link is Down" issue e466278662be mmc: sdhci: Fix ADMA for PAGE_SIZE >= 64KiB e09e868c6341 tracing: Fix pid filtering when triggers are attached f5bbebfd7ca1 tracing/uprobe: Fix uprobe_perf_open probes iteration 5c895828f421 KVM: PPC: Book3S HV: Prevent POWER7/8 TLB flush flushing SLB 4f1adc3f572a xen: detect uninitialized xenbus in xenbus_init 173fe1aedf67 xen: don't continue xenstore initialization in case of errors 2e1ec01af2c7 staging: rtl8192e: Fix use after free in _rtl92e_pci_disconnect() e72e981d16fc staging/fbtft: Fix backlight 9b406e39e539 HID: wacom: Use "Confidence" flag to prevent reporting invalid contacts c03ad97293d2 Revert "parisc: Fix backtrace to always include init funtion names" 4a6f918a92b0 media: cec: copy sequence field for the reply 8d0b9ea19174 ALSA: ctxfi: Fix out-of-range access aaa83768ba39 binder: fix test regression due to sender_euid change d797fde8644a usb: hub: Fix locking issues with address0_mutex 4b354aeea431 usb: hub: Fix usb enumeration issue due to address0 race d00bf013aed2 usb: typec: fusb302: Fix masking of comparator and bc_lvl interrupts 7b6f44856da5 net: nexthop: fix null pointer dereference when IPv6 is not enabled 9ad421aedc55 usb: dwc2: hcd_queue: Fix use of floating point literal e44a934f9e04 usb: dwc2: gadget: Fix ISOC flow for elapsed frames c2e05c4ed8a3 USB: serial: option: add Fibocom FM101-GL variants ee034eae9d9b USB: serial: option: add Telit LE910S1 0x9200 composition Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman (cherry picked from commit 94264cb2b1355a9b91bbbe701da858866cccb370) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.4.bb | 6 ++--- .../linux/linux-yocto-tiny_5.4.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index 6cd1ede6ea..bbfa649fbc 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "17e5e7a7f94d3d11d9d22fb6de614492596c0a8d" -SRCREV_meta ?= "51f40ce1f17bfdb31fb7bf4dd81f3b53bfd49fcc" +SRCREV_machine ?= "edc3786860d52e6116ac35299e7b3ffb5fa2c541" +SRCREV_meta ?= "c8cf16c4be0513bc1e4c4349ff447737d850d222" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.162" +LINUX_VERSION ?= "5.4.163" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 024ab77d08..22983cc9ff 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.162" +LINUX_VERSION ?= "5.4.163" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "e3cbc4448222038ed98186783b61b099e35ef08d" -SRCREV_machine ?= "0c97af59c367809671cf25eed595e3fef21eb493" -SRCREV_meta ?= "51f40ce1f17bfdb31fb7bf4dd81f3b53bfd49fcc" +SRCREV_machine_qemuarm ?= "71d15eb7c150cf6101ba19177fc3b8d9dea3c81a" +SRCREV_machine ?= "3ecd5d9389679dcd6b5924990795a7a1800ccb8c" +SRCREV_meta ?= "c8cf16c4be0513bc1e4c4349ff447737d850d222" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index cbcd167715..4d5d536ab9 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "d787585d276bc42eb17f3b04ed8e1c36d51b3258" -SRCREV_machine_qemuarm64 ?= "87892857e00d1cdb6802abaea19cf65bee71da55" -SRCREV_machine_qemumips ?= "4f84fe187ca152aab43fa6008989a5d00cca6bdb" -SRCREV_machine_qemuppc ?= "4936240e37cfc88fe728add8ff3d9bd548c400ef" -SRCREV_machine_qemuriscv64 ?= "439da70d7184793365a45e83ec1b816fd0ec0afe" -SRCREV_machine_qemux86 ?= "439da70d7184793365a45e83ec1b816fd0ec0afe" -SRCREV_machine_qemux86-64 ?= "439da70d7184793365a45e83ec1b816fd0ec0afe" -SRCREV_machine_qemumips64 ?= "cef4f9fba704dba2cca97111ead9e579fde115c4" -SRCREV_machine ?= "439da70d7184793365a45e83ec1b816fd0ec0afe" -SRCREV_meta ?= "51f40ce1f17bfdb31fb7bf4dd81f3b53bfd49fcc" +SRCREV_machine_qemuarm ?= "510b022c947de1f73032233cb779797c47a5f20d" +SRCREV_machine_qemuarm64 ?= "f16453629ea08136e0f55450a27c8e9b6ab3d812" +SRCREV_machine_qemumips ?= "2dfc09d7dfe1d44f8e6782a6b00859b4be2eab1d" +SRCREV_machine_qemuppc ?= "4a1091334ce7caf51953bbaee9efe0874a06037b" +SRCREV_machine_qemuriscv64 ?= "ccec7b885902fcb1628b33ed2b35d5a68b287f93" +SRCREV_machine_qemux86 ?= "ccec7b885902fcb1628b33ed2b35d5a68b287f93" +SRCREV_machine_qemux86-64 ?= "ccec7b885902fcb1628b33ed2b35d5a68b287f93" +SRCREV_machine_qemumips64 ?= "50a3d639d9147f947ea1987b9679b465936a7f71" +SRCREV_machine ?= "ccec7b885902fcb1628b33ed2b35d5a68b287f93" +SRCREV_meta ?= "c8cf16c4be0513bc1e4c4349ff447737d850d222" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,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-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.162" +LINUX_VERSION ?= "5.4.163" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Wed Jan 5 15:18:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2074 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 EF3C7C433EF for ; Wed, 5 Jan 2022 15:19:21 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:21 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=L2P5qQ9w; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395961; x=1672931961; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=ZblTHqjOrjIL/5VaGepJ8Fdw3q6Rms2qcTS9usOvDLk=; b=L2P5qQ9wQtDaDhVMHrA5ZH3x+AkKJUv8Qcw9l131GfjszUG6YxZMNuR9 OoEkKTqQON+W1MQmoQ+2ZZ52A87iqrTKdc0ZOUgnXVhdJxCrgZwQTqnxc hanlpGMQC3ZUXTUrFjcVo5vSoE7tQvNJm5JOdfK7ijBk1DLOjQwLbkxDF mWdN63/wD4D09KPsTkqlm9OCCbBmOFmVJka1hpeptR2wgie0HS3knlrts OhjoOhXocsvW/SjObXuEMDZuqhx8juw3ptqo1Qa4nB1KPD538CPbaZqi1 RCP4s/D2LeqYzndWZEJeRAMCcOTG5VgJAaORJsEcqxiOUnDAtMblR0VCB w==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742825" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742825" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:20 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128664" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:19 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 13/24] linux-yocto/5.4: update to v5.4.165 Date: Wed, 5 Jan 2022 23:18:33 +0800 Message-Id: <5217bf4a33be1ed33d2ff83d754dab9d0fdc7fb7.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:21 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160198 From: Bruce Ashfield Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: 7f70428f0109 Linux 5.4.165 3a99b4baff3c bpf: Add selftests to cover packet access corner cases b8a2c49aa956 misc: fastrpc: fix improper packet size calculation 8f9a25e452f8 irqchip: nvic: Fix offset for Interrupt Priority Offsets 61981e5fee6d irqchip/irq-gic-v3-its.c: Force synchronisation when issuing INVALL fc20091b3f97 irqchip/armada-370-xp: Fix support for Multi-MSI interrupts a3689e694b39 irqchip/armada-370-xp: Fix return value of armada_370_xp_msi_alloc() 8c163a142771 iio: accel: kxcjk-1013: Fix possible memory leak in probe and remove 20f0fb418b6c iio: ad7768-1: Call iio_trigger_notify_done() on error b68f44829b73 iio: adc: axp20x_adc: fix charging current reporting on AXP22x e79d86de1e96 iio: at91-sama5d2: Fix incorrect sign extension 5f3d932f91cb iio: dln2: Check return value of devm_iio_trigger_register() 7447f0450825 iio: dln2-adc: Fix lockdep complaint 4c0fa7ed5a3a iio: itg3200: Call iio_trigger_notify_done() on error e67d60c5ebb0 iio: kxsd9: Don't return error code in trigger handler f143cfdccfc9 iio: ltr501: Don't return error code in trigger handler acf0088ac073 iio: mma8452: Fix trigger reference couting 02553e971255 iio: stk3310: Don't return error code in interrupt handler 1374297ccf61 iio: trigger: stm32-timer: fix MODULE_ALIAS 1dadba28a829 iio: trigger: Fix reference counting ec0cddcc2454 xhci: avoid race between disable slot command and host runtime suspend 8d45969ca31a usb: core: config: using bit mask instead of individual bits d1eee0a3936f xhci: Remove CONFIG_USB_DEFAULT_PERSIST to prevent xHCI from runtime suspending d2f242d7a9ce usb: core: config: fix validation of wMaxPacketValue entries 9978777c5409 USB: gadget: zero allocate endpoint 0 buffers fd6de5a0cd42 USB: gadget: detect too-big endpoint 0 requests 46d3477cdef3 selftests/fib_tests: Rework fib_rp_filter_test() caff29d1129c net/qla3xxx: fix an error code in ql_adapter_up() 4aa28ac9373c net, neigh: clear whole pneigh_entry at alloc time f23f60e81af2 net: fec: only clear interrupt of handling queue in fec_enet_rx_queue() 05bc4d266eaf net: altera: set a couple error code in probe() 84a890d6959e net: cdc_ncm: Allow for dwNtbOutMaxSize to be unset or zero e9ca63a07dd3 tools build: Remove needless libpython-version feature check that breaks test-all fast path 49e59d514408 dt-bindings: net: Reintroduce PHY no lane swap binding b78a27fa58cc mtd: rawnand: fsmc: Fix timing computation 7596d0deec7f mtd: rawnand: fsmc: Take instruction delay into account 9f88ca269c41 i40e: Fix pre-set max number of queues for VF 171527da8414 i40e: Fix failed opcode appearing if handling messages from VF ee8bfa62bf79 ASoC: qdsp6: q6routing: Fix return value from msm_routing_put_audio_mixer 43dcb79c1d9b qede: validate non LSO skb length 727858a98ac9 block: fix ioprio_get(IOPRIO_WHO_PGRP) vs setuid(2) 9ba5635cfad7 tracefs: Set all files to the same group ownership as the mount option 4105e6a128e8 aio: fix use-after-free due to missing POLLFREE handling 380185111fa8 aio: keep poll requests on waitqueue until completed aac8151624b6 signalfd: use wake_up_pollfree() 1a478a0522e5 binder: use wake_up_pollfree() e0c03d15cd03 wait: add wake_up_pollfree() 6db0db1657cb libata: add horkage for ASMedia 1092 050ac9da6768 x86/sme: Explicitly map new EFI memmap table as encrypted 9f5b334ee654 can: m_can: Disable and ignore ELO interrupt abb4eff3dcd2 can: pch_can: pch_can_rx_normal: fix use after free 291a164ac1f3 drm/syncobj: Deal with signalled fences in drm_syncobj_find_fence. f53b73953ff8 clk: qcom: regmap-mux: fix parent clock lookup e871f89ebfe2 tracefs: Have new files inherit the ownership of their parent f5734b1714ca nfsd: Fix nsfd startup race (again) 412498e9e54b btrfs: replace the BUG_ON in btrfs_del_root_ref with proper error handling aa4740bc8595 btrfs: clear extent buffer uptodate when we fail to write it 434927e938ce ALSA: pcm: oss: Handle missing errors in snd_pcm_oss_change_params*() 76f19e4cbb54 ALSA: pcm: oss: Limit the period size to 16MB f12c8a7515f6 ALSA: pcm: oss: Fix negative period/buffer sizes 5b06fa0cd2be ALSA: hda/realtek - Add headset Mic support for Lenovo ALC897 platform caaea6bd3e18 ALSA: ctl: Fix copy of updated id with element read/write a7ea5c099ad4 mm: bdi: initialize bdi_min_ratio when bdi is unregistered b8a79804056b IB/hfi1: Correct guard on eager buffer deallocation ab1be91cf1ec iavf: Fix reporting when setting descriptor count c21bb711d0fb iavf: restore MSI state on reset c8ae8c812e16 udp: using datalen to cap max gso segments ef8804e47c0a seg6: fix the iif in the IPv6 socket control block 2e0e072e62fd nfp: Fix memory leak in nfp_cpp_area_cache_add() 3db6482523ea bonding: make tx_rebalance_counter an atomic 143ceb9b6736 ice: ignore dropped packets during init 4174bd4221c2 bpf: Fix the off-by-two error in range markings 15f987473d33 vrf: don't run conntrack on vrf with !dflt qdisc 8d3563ecbca3 selftests: netfilter: add a vrf+conntrack testcase 48fcd08fdbe0 nfc: fix potential NULL pointer deref in nfc_genl_dump_ses_done 1a295fea90e1 can: sja1000: fix use after free in ems_pcmcia_add_card() fbcb12bc9dbf can: kvaser_pciefd: kvaser_pciefd_rx_error_frame(): increase correct stats->{rx,tx}_errors counter 68daa476f499 can: kvaser_usb: get CAN clock frequency from device a7944962ee1f HID: check for valid USB device for many HID drivers e9114b9dc8ea HID: wacom: fix problems when device is not a valid USB device 8e0ceff632f4 HID: bigbenff: prevent null pointer dereference 31520ec149d2 HID: add USB_HID dependancy on some USB HID drivers f8a6538587b4 HID: add USB_HID dependancy to hid-chicony ee8477d1dbce HID: add USB_HID dependancy to hid-prodikeys 6e1e0a014258 HID: add hid_is_usb() function to make it simpler for USB detection 1e8db541c2be HID: google: add eel USB id cb7b13c98218 HID: quirks: Add quirk for the Microsoft Surface 3 type-cover f99b2013793f ntfs: fix ntfs_test_inode and ntfs_init_locked_inode function type eb246f58e1fc serial: tegra: Change lower tolerance baud rate limit for tegra20 and tegra30 e3c95128def1 Linux 5.4.164 5df7d6a012fc ipmi: msghandler: Make symbol 'remove_work_wq' static 5d1e83fffbc9 net/tls: Fix authentication failure in CCM mode cffd7583c92e parisc: Mark cr16 CPU clocksource unstable on all SMP machines 23b40edec832 iwlwifi: mvm: retry init flow if failed 8d6e4b422d0c serial: 8250_pci: rewrite pericom_do_set_divisor() 181cf7622ce2 serial: 8250_pci: Fix ACCES entries in pci_serial_quirks array c5da8aa44105 serial: core: fix transmit-buffer reset and memleak 7ed4a98a174c serial: pl011: Add ACPI SBSA UART match id 9e16682c94ec tty: serial: msm_serial: Deactivate RX DMA for polling support b5dd5a467ec6 x86/64/mm: Map all kernel memory into trampoline_pgd 72736a3b90ef x86/tsc: Disable clocksource watchdog for TSC on qualified platorms fe3cd48420cd x86/tsc: Add a timer to make sure TSC_adjust is always checked 957a203fe1b7 usb: typec: tcpm: Wait in SNK_DEBOUNCED until disconnect 7fbde744374e USB: NO_LPM quirk Lenovo Powered USB-C Travel Hub 095a39a2cc27 xhci: Fix commad ring abort, write all 64 bits to CRCR register. caedb12c7737 vgacon: Propagate console boot parameters before calling `vc_resize' a42944686249 parisc: Fix "make install" on newer debian releases fbe7eacab7eb parisc: Fix KBUILD_IMAGE for self-extracting kernel c6a9060be53f sched/uclamp: Fix rq->uclamp_max not set on first enqueue 8ae8ccd2402f KVM: x86/pmu: Fix reserved bits for AMD PerfEvtSeln register ee38eb8cf9a7 ipv6: fix memory leak in fib6_rule_suppress 9d1596282644 drm/msm: Do hw_init() before capturing GPU state 10bad5a1977f net/smc: Keep smc_close_final rc during active close 3f2a23fd13ff net/rds: correct socket tunable error in rds_tcp_tune() 01c60b3f477b ipv4: convert fib_num_tclassid_users to atomic_t efb073981756 net: annotate data-races on txq->xmit_lock_owner bfec04c689af net: marvell: mvpp2: Fix the computation of shared CPUs d4034bb9b532 net: usb: lan78xx: lan78xx_phy_init(): use PHY_POLL instead of "0" if no IRQ is available 3e70e3a72d80 rxrpc: Fix rxrpc_local leak in rxrpc_lookup_peer() ae8a253f3fe6 selftests: net: Correct case name e461a9816a1a net/mlx4_en: Fix an use-after-free bug in mlx4_en_try_alloc_resources() af120fcffd64 siphash: use _unaligned version by default f70c6281eafb net: mpls: Fix notifications when deleting a device bbeb0325a746 net: qlogic: qlcnic: Fix a NULL pointer dereference in qlcnic_83xx_add_rings() 49ab33623107 natsemi: xtensa: fix section mismatch warnings 063d2233623a i2c: cbus-gpio: set atomic transfer callback f5d7bd03f888 i2c: stm32f7: stop dma transfer in case of NACK 9fce2ead76f4 i2c: stm32f7: recover the bus on access timeout bc0215cbd162 i2c: stm32f7: flush TX FIFO upon transfer errors 742a5ae18c5f sata_fsl: fix warning in remove_proc_entry when rmmod sata_fsl 77393806c76b sata_fsl: fix UAF in sata_fsl_port_stop when rmmod sata_fsl 03d4462ba3bc fget: check that the fd still exists after getting a ref to it a78b607e1b43 s390/pci: move pseudo-MMIO to prevent MIO overlap 006edd736dc8 cpufreq: Fix get_cpu_device() failure in add_cpu_dev_symlink() 648813c26d64 ipmi: Move remove_work to dedicated workqueue 3f8f7eef8c32 rt2x00: do not mark device gone on EPROTO errors during start c2e2ccaac3d9 kprobes: Limit max data_size of the kretprobe instances 03ee5e8c63c3 vrf: Reset IPCB/IP6CB when processing outbound pkts in vrf dev xmit f82013d1d68f net/smc: Avoid warning of possible recursive locking df5990db088d perf report: Fix memory leaks around perf_tip() b380d09e44e8 perf hist: Fix memory leak of a perf_hpp_fmt 57247f703539 net: ethernet: dec: tulip: de4x5: fix possible array overflows in type3_infoblock() 77ff16690945 net: tulip: de4x5: fix the problem that the array 'lp->phy[8]' may be out of bound 99bb25cb6753 ethernet: hisilicon: hns: hns_dsaf_misc: fix a possible array overflow in hns_dsaf_ge_srst_by_port() 0f89c59e75ac ata: ahci: Add Green Sardine vendor ID as board_ahci_mobile 36c8f686956d scsi: iscsi: Unblock session then wake up error handler dbbc8aeaf7a1 thermal: core: Reset previous low and high trip during thermal zone init ebc8aed3b9eb btrfs: check-integrity: fix a warning on write caching disabled disk 5db28ea9f1a4 s390/setup: avoid using memblock_enforce_memory_limit 5d93fc221c5d platform/x86: thinkpad_acpi: Fix WWAN device disabled issue after S3 deep 96274948989c net: return correct error code 89d15a2e40d7 atlantic: Fix OOB read and write in hw_atl_utils_fw_rpc_wait d6e981ec9491 net/smc: Transfer remaining wait queue entries during fallback a1671b224bc0 mac80211: do not access the IV when it was stripped 3200cf7b9b7e drm/sun4i: fix unmet dependency on RESET_CONTROLLER for PHY_SUN6I_MIPI_DPHY 7ef990365059 gfs2: Fix length of holes reported at end-of-file fe915dbd0f83 can: j1939: j1939_tp_cmd_recv(): check the dst address of TP.CM_BAM fb158a26544c arm64: dts: mcbin: support 2W SFP modules 39b3b131d10d of: clk: Make self-contained aad716bd144a NFSv42: Fix pagecache invalidation after COPY/CLONE Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman (cherry picked from commit 2784863606e27715ee5e7f582bb6c4df67879c95) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.4.bb | 6 ++--- .../linux/linux-yocto-tiny_5.4.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index bbfa649fbc..f4b3aa114a 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "edc3786860d52e6116ac35299e7b3ffb5fa2c541" -SRCREV_meta ?= "c8cf16c4be0513bc1e4c4349ff447737d850d222" +SRCREV_machine ?= "6a419217887717ae815e47990c4f50540e4486f0" +SRCREV_meta ?= "c9027edfa2919e0148ba12d56afa7c5a797aad10" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.163" +LINUX_VERSION ?= "5.4.165" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 22983cc9ff..0f97913ebf 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.163" +LINUX_VERSION ?= "5.4.165" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "71d15eb7c150cf6101ba19177fc3b8d9dea3c81a" -SRCREV_machine ?= "3ecd5d9389679dcd6b5924990795a7a1800ccb8c" -SRCREV_meta ?= "c8cf16c4be0513bc1e4c4349ff447737d850d222" +SRCREV_machine_qemuarm ?= "de76f2a485fb6c73e3978b0138f756afb22e4db4" +SRCREV_machine ?= "74fb33c678e2cf4cfbf9c6aa3e1fe6b019d10a5e" +SRCREV_meta ?= "c9027edfa2919e0148ba12d56afa7c5a797aad10" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 4d5d536ab9..2b0466789e 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "510b022c947de1f73032233cb779797c47a5f20d" -SRCREV_machine_qemuarm64 ?= "f16453629ea08136e0f55450a27c8e9b6ab3d812" -SRCREV_machine_qemumips ?= "2dfc09d7dfe1d44f8e6782a6b00859b4be2eab1d" -SRCREV_machine_qemuppc ?= "4a1091334ce7caf51953bbaee9efe0874a06037b" -SRCREV_machine_qemuriscv64 ?= "ccec7b885902fcb1628b33ed2b35d5a68b287f93" -SRCREV_machine_qemux86 ?= "ccec7b885902fcb1628b33ed2b35d5a68b287f93" -SRCREV_machine_qemux86-64 ?= "ccec7b885902fcb1628b33ed2b35d5a68b287f93" -SRCREV_machine_qemumips64 ?= "50a3d639d9147f947ea1987b9679b465936a7f71" -SRCREV_machine ?= "ccec7b885902fcb1628b33ed2b35d5a68b287f93" -SRCREV_meta ?= "c8cf16c4be0513bc1e4c4349ff447737d850d222" +SRCREV_machine_qemuarm ?= "abbd99315753c7f8bde10fb6ac5b31d5ab7cdcd6" +SRCREV_machine_qemuarm64 ?= "ab4c88e094069467cdb4e7d7bbac303e5039bc9f" +SRCREV_machine_qemumips ?= "b52f600f9157b8107e5318d61f43007efb99c02c" +SRCREV_machine_qemuppc ?= "5b3b062a7c87b3265274da81dcf675596b90d65b" +SRCREV_machine_qemuriscv64 ?= "c232ad04fa15d324714799b90b9c4810a5dbe1bc" +SRCREV_machine_qemux86 ?= "c232ad04fa15d324714799b90b9c4810a5dbe1bc" +SRCREV_machine_qemux86-64 ?= "c232ad04fa15d324714799b90b9c4810a5dbe1bc" +SRCREV_machine_qemumips64 ?= "b0057ef25af45fda6ae3ae9274cab8c248b4a70b" +SRCREV_machine ?= "c232ad04fa15d324714799b90b9c4810a5dbe1bc" +SRCREV_meta ?= "c9027edfa2919e0148ba12d56afa7c5a797aad10" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,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-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.163" +LINUX_VERSION ?= "5.4.165" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Wed Jan 5 15:18:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2075 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 0D72DC433FE for ; Wed, 5 Jan 2022 15:19:23 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:22 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=IkX6RnhV; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395962; x=1672931962; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=RomS84L8Lhee+DGoX345mHW6JtencMsY/eK94Z9756k=; b=IkX6RnhVZKJkn2RXTWPW84PSQHgmZpgToCVESMewMniy6YYChaxEWcDd D1UXzgEAvqjzFVVXs3R1IWpgs3AjW0epjnuOY9UUHUk4xucrCmEmFrJcb yLFlQERtOXO4mdl2nxw4kU4hgPh82JuKWClVL2yiAu/1iUM30CCmfmwbB ayhG518xpiCwuWGy7XWDMNQrsx5/TDLf9lp3Cy7JvG4VB3S4O89k25ziJ FvHAPp1+LCw8FLd/uX7nyk1I+zAG2HONVmG/GpSfG62ZCkUltB5dCdx+p fI0W+x29YglWRo1tuLTRkaA9xSo4lU0kZ9W7BRhLxoIhz9lcZpoSLhvuc g==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742833" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742833" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:22 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128671" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:21 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 14/24] linux-yocto/5.4: update to v5.4.167 Date: Wed, 5 Jan 2022 23:18:34 +0800 Message-Id: X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:23 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160199 From: Bruce Ashfield Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits: e8ef940326ef Linux 5.4.167 c97579584fa8 arm: ioremap: don't abuse pfn_valid() to check if pfn is in RAM 6026d4032dbb arm: extend pfn_valid to take into account freed memory map alignment 492f4d3cde95 memblock: ensure there is no overflow in memblock_overlaps_region() bdca964781a0 memblock: align freed memory map on pageblock boundaries with SPARSEMEM 60111b30be0b memblock: free_unused_memmap: use pageblock units instead of MAX_ORDER 3e8e272805e7 hwmon: (dell-smm) Fix warning on /proc/i8k creation error f6f1d1911492 bpf: Fix integer overflow in argument calculation for bpf_map_area_alloc b06b1f46306a selinux: fix race condition when computing ocontext SIDs 2fb8e4267c47 KVM: x86: Ignore sparse banks size for an "all CPUs", non-sparse IPI req 467359957ad2 tracing: Fix a kmemleak false positive in tracing_map fb8cd2b336e4 drm/amd/display: add connector type check for CRC source set 8fc2f28e3348 drm/amd/display: Fix for the no Audio bug with Tiled Displays c0315e93552e net: netlink: af_netlink: Prevent empty skb by adding a check on len. 7ff666e6fdc0 i2c: rk3x: Handle a spurious start completion interrupt flag 409ecd029ac5 parisc/agp: Annotate parisc agp init functions with __init 4233fbd459ac net/mlx4_en: Update reported link modes for 1/10G b6158d968b3e drm/msm/dsi: set default num_data_lanes d731ecc6f2ea nfc: fix segfault in nfc_genl_dump_devices_done c32c40ff8092 Linux 5.4.166 eb1b5eaaddec netfilter: selftest: conntrack_vrf.sh: fix file permission Signed-off-by: Bruce Ashfield Signed-off-by: Steve Sakoman (cherry picked from commit ebfe803e9545b862416e3a647c7a5e19e9c6acbd) Signed-off-by: Anuj Mittal --- .../linux/linux-yocto-rt_5.4.bb | 6 ++--- .../linux/linux-yocto-tiny_5.4.bb | 8 +++---- meta/recipes-kernel/linux/linux-yocto_5.4.bb | 22 +++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb index f4b3aa114a..8922c0622d 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "6a419217887717ae815e47990c4f50540e4486f0" -SRCREV_meta ?= "c9027edfa2919e0148ba12d56afa7c5a797aad10" +SRCREV_machine ?= "2bddc20729f986e46ba5b802fa6ce8716ee34506" +SRCREV_meta ?= "ff304dbaec03398dc510602800b19d28b7c82927" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.4;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.4.165" +LINUX_VERSION ?= "5.4.167" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb index 0f97913ebf..a2db551ccb 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb @@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.165" +LINUX_VERSION ?= "5.4.167" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -15,9 +15,9 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine_qemuarm ?= "de76f2a485fb6c73e3978b0138f756afb22e4db4" -SRCREV_machine ?= "74fb33c678e2cf4cfbf9c6aa3e1fe6b019d10a5e" -SRCREV_meta ?= "c9027edfa2919e0148ba12d56afa7c5a797aad10" +SRCREV_machine_qemuarm ?= "e8825a1df3d08af26acf8fc2ddb140c40aa233f4" +SRCREV_machine ?= "b9dbced11f660908cec12d5e1339bbff0ac28d59" +SRCREV_meta ?= "ff304dbaec03398dc510602800b19d28b7c82927" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.4.bb b/meta/recipes-kernel/linux/linux-yocto_5.4.bb index 2b0466789e..78479b37e7 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.4.bb @@ -12,16 +12,16 @@ KBRANCH_qemux86 ?= "v5.4/standard/base" KBRANCH_qemux86-64 ?= "v5.4/standard/base" KBRANCH_qemumips64 ?= "v5.4/standard/mti-malta64" -SRCREV_machine_qemuarm ?= "abbd99315753c7f8bde10fb6ac5b31d5ab7cdcd6" -SRCREV_machine_qemuarm64 ?= "ab4c88e094069467cdb4e7d7bbac303e5039bc9f" -SRCREV_machine_qemumips ?= "b52f600f9157b8107e5318d61f43007efb99c02c" -SRCREV_machine_qemuppc ?= "5b3b062a7c87b3265274da81dcf675596b90d65b" -SRCREV_machine_qemuriscv64 ?= "c232ad04fa15d324714799b90b9c4810a5dbe1bc" -SRCREV_machine_qemux86 ?= "c232ad04fa15d324714799b90b9c4810a5dbe1bc" -SRCREV_machine_qemux86-64 ?= "c232ad04fa15d324714799b90b9c4810a5dbe1bc" -SRCREV_machine_qemumips64 ?= "b0057ef25af45fda6ae3ae9274cab8c248b4a70b" -SRCREV_machine ?= "c232ad04fa15d324714799b90b9c4810a5dbe1bc" -SRCREV_meta ?= "c9027edfa2919e0148ba12d56afa7c5a797aad10" +SRCREV_machine_qemuarm ?= "6669d1a2f103a3275306cde2486a0c133ab288a4" +SRCREV_machine_qemuarm64 ?= "0727e136f0c04aac28ee442d1a5b208d41021c00" +SRCREV_machine_qemumips ?= "ec2a556c8c4bea3c26d85d9097fcb7bc37d9b470" +SRCREV_machine_qemuppc ?= "dc1f229c713f712f3e29a8f3a20e45120aeccf2a" +SRCREV_machine_qemuriscv64 ?= "6244469059318276e2ffca54f85ecd3d13cd6756" +SRCREV_machine_qemux86 ?= "6244469059318276e2ffca54f85ecd3d13cd6756" +SRCREV_machine_qemux86-64 ?= "6244469059318276e2ffca54f85ecd3d13cd6756" +SRCREV_machine_qemumips64 ?= "ec66f75ec62c5b2f576b98dcfd7dc870643590da" +SRCREV_machine ?= "6244469059318276e2ffca54f85ecd3d13cd6756" +SRCREV_meta ?= "ff304dbaec03398dc510602800b19d28b7c82927" # remap qemuarm to qemuarma15 for the 5.4 kernel # KMACHINE_qemuarm ?= "qemuarma15" @@ -30,7 +30,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-5.4;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814" -LINUX_VERSION ?= "5.4.165" +LINUX_VERSION ?= "5.4.167" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Wed Jan 5 15:18:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2076 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 EDFA3C433F5 for ; Wed, 5 Jan 2022 15:19:24 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:24 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=OOEdlAmC; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395964; x=1672931964; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=3Hngvv0DAQgLv0LDcXjNzRGlR6BZCVBfhHWl2WUxPkE=; b=OOEdlAmCAiktdItEGN6w23zjLyMwtYmWmz4Qlta7FgWcbRL+2bB8c9EV wYeS8yEhqhCENMkNLnHNSaZHEgF/WNAStaWovRZXGhPoxstmo7np3TNX5 2O3VEoy5e356DD7fsOZQ6OXFSm4OAHBZhsPrJatlXMM5XBYJFlD461OXJ YY9DBDBK0Z1YQuXu53IckIrEY36ocsiyHb1U0zDpbmJHFntGRoBt7MsNK O5aaNCcgKd4dtl1IGykMmnE4oMfM/mrSccGJjggw/NU4HGicRJPcAiAu+ 0i8txEcwJrKRt8S9uoiCAcsBSCV6OzwMt9J/fs0xZFchgq5U3bBaZIo2z Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742838" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742838" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:23 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128679" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:22 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 15/24] xserver-xorg: fix CVE-2021-4008 Date: Wed, 5 Jan 2022 23:18:35 +0800 Message-Id: X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:24 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160200 From: Kai Kang Backport patch to fix CVE-2021-4008 for xserver-xorg. CVE: CVE-2021-4008 Signed-off-by: Kai Kang Signed-off-by: Anuj Mittal --- .../xserver-xorg/CVE-2021-4008.patch | 59 +++++++++++++++++++ .../xorg-xserver/xserver-xorg_1.20.10.bb | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4008.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4008.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4008.patch new file mode 100644 index 0000000000..3277be0185 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4008.patch @@ -0,0 +1,59 @@ +Backport patch to fix CVE-2021-4008. + +CVE: CVE-2021-4008 +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/ebce7e2] + +Signed-off-by: Kai Kang + +From ebce7e2d80e7c80e1dda60f2f0bc886f1106ba60 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:03 +0200 +Subject: [PATCH] render: Fix out of bounds access in + SProcRenderCompositeGlyphs() + +ZDI-CAN-14192, CVE-2021-4008 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + render/render.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/render/render.c b/render/render.c +index c376090ca..456f156d4 100644 +--- a/render/render.c ++++ b/render/render.c +@@ -2309,6 +2309,9 @@ SProcRenderCompositeGlyphs(ClientPtr client) + + i = elt->len; + if (i == 0xff) { ++ if (buffer + 4 > end) { ++ return BadLength; ++ } + swapl((int *) buffer); + buffer += 4; + } +@@ -2319,12 +2322,18 @@ SProcRenderCompositeGlyphs(ClientPtr client) + buffer += i; + break; + case 2: ++ if (buffer + i * 2 > end) { ++ return BadLength; ++ } + while (i--) { + swaps((short *) buffer); + buffer += 2; + } + break; + case 4: ++ if (buffer + i * 4 > end) { ++ return BadLength; ++ } + while (i--) { + swapl((int *) buffer); + buffer += 4; +-- +GitLab + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb index e0551fa999..9a7aa1ed9a 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb @@ -9,6 +9,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ file://CVE-2021-3472.patch \ file://0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch \ + file://CVE-2021-4008.patch \ " SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" From patchwork Wed Jan 5 15:18:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2077 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 EFCE3C433EF for ; Wed, 5 Jan 2022 15:19:25 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:25 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=mpPKquY+; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395965; x=1672931965; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=i9uNqMyLMWMiYyxSFdUdkNLI0eBLpQv44Q+8awy3p9Q=; b=mpPKquY+DFDI717Tk33Y0yxdnTTwe7At3abXCU//VdWZEx0l9Hqu96Bi abUxe9ryZph6AZvKV0AO3rTcXJ7FYkLTk1BvbxpSCr7JM9xrEdpFTUPzI EraQxvNcmrLcGsws2zK6IzCriqJJpJgm0UaiuVIi131z4vxkNK8Tq9N9x V62cPSYSqj4qcb3rSQTiu6ogJ2NmlkKTnOBFKyyBsr1E776S2bP34jeIF zYMsw9IqTF7fm97pEoYq8V2O2nub0bLVLrtZTjDjKuN4WE8wXb21SP8Ai UKg5VKTKGVDW7FJpSPWrBXRZ+2F7JzWmg/TPcm0QfPSZO39r2ieSBS9Qf A==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742845" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742845" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:25 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128686" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:24 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 16/24] xserver-xorg: fix CVE-2021-4009 Date: Wed, 5 Jan 2022 23:18:36 +0800 Message-Id: <33581b19a2eb00b5905325e966edd7f7519a2924.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:25 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160201 From: Kai Kang Backport patch to fix CVE-2021-4009 for xserver-xorg. CVE: CVE-2021-4009 Signed-off-by: Kai Kang Signed-off-by: Anuj Mittal --- .../xserver-xorg/CVE-2021-4009.patch | 50 +++++++++++++++++++ .../xorg-xserver/xserver-xorg_1.20.10.bb | 1 + 2 files changed, 51 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4009.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4009.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4009.patch new file mode 100644 index 0000000000..ddfbb43ee4 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4009.patch @@ -0,0 +1,50 @@ +Backport patch to fix CVE-2021-4009. + +CVE: CVE-2021-4009 +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/b519675] + +Signed-off-by: Kai Kang + +From b5196750099ae6ae582e1f46bd0a6dad29550e02 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:01 +0200 +Subject: [PATCH] xfixes: Fix out of bounds access in + *ProcXFixesCreatePointerBarrier() + +ZDI-CAN-14950, CVE-2021-4009 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + xfixes/cursor.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/xfixes/cursor.c b/xfixes/cursor.c +index 60580b88f..c5d4554b2 100644 +--- a/xfixes/cursor.c ++++ b/xfixes/cursor.c +@@ -1010,7 +1010,8 @@ ProcXFixesCreatePointerBarrier(ClientPtr client) + { + REQUEST(xXFixesCreatePointerBarrierReq); + +- REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices)); ++ REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, ++ pad_to_int32(stuff->num_devices * sizeof(CARD16))); + LEGAL_NEW_RESOURCE(stuff->barrier, client); + + return XICreatePointerBarrier(client, stuff); +@@ -1027,7 +1028,8 @@ SProcXFixesCreatePointerBarrier(ClientPtr client) + + swaps(&stuff->length); + swaps(&stuff->num_devices); +- REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, pad_to_int32(stuff->num_devices)); ++ REQUEST_FIXED_SIZE(xXFixesCreatePointerBarrierReq, ++ pad_to_int32(stuff->num_devices * sizeof(CARD16))); + + swapl(&stuff->barrier); + swapl(&stuff->window); +-- +GitLab + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb index 9a7aa1ed9a..ac32bb25c2 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb @@ -10,6 +10,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://CVE-2021-3472.patch \ file://0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch \ file://CVE-2021-4008.patch \ + file://CVE-2021-4009.patch \ " SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" From patchwork Wed Jan 5 15:18:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2079 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 F1065C433FE for ; Wed, 5 Jan 2022 15:19:31 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:31 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=NMXo2Kxk; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395970; x=1672931970; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=0GTaRMgaMyMTaPRKelEdfNAY5Otl/5i25j8/k5bo4mo=; b=NMXo2KxkxPcZr3hD8Yc0sID7rkaAYga7yytdZd8bXPkP86odTzLqOtBu 0KRvPXLXsTPS+W4xq7UA1AbKTAgA8deZJSuTsTKJDCauk+jGtVCEnu5b2 k76xWw2W08iJG836+uOPp0X3hr4l+DoklkhPBGwtXpyjnNK6Rck5C5kES gTeX9jkk/Owedsw81LFEnAUCX+ZMLtWeqq+5RomZ8TQ1Ihmm1UB+lsc1S 5oiZpLz5icMceKnl5DLJ69HpGvA1KiR7nMgzgvhJ+oHWxlyqMtJRRrflT x8ZcR9z3mh4i0bPRSpHEF2RkD3lYlClCBPoi9I2FjkEl2/7bNYWFmRmds g==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742853" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742853" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:26 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128694" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:25 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 17/24] xserver-xorg: fix CVE-2021-4010 Date: Wed, 5 Jan 2022 23:18:37 +0800 Message-Id: <487971876baa9913541a187d98deddc00e60d3f8.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160202 From: Kai Kang Backport patch to fix CVE-2021-4010 for xserver-xorg. CVE: CVE-2021-4010 Signed-off-by: Kai Kang Signed-off-by: Anuj Mittal --- .../xserver-xorg/CVE-2021-4010.patch | 39 +++++++++++++++++++ .../xorg-xserver/xserver-xorg_1.20.10.bb | 1 + 2 files changed, 40 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4010.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4010.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4010.patch new file mode 100644 index 0000000000..06ebe7d077 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4010.patch @@ -0,0 +1,39 @@ +Backport patch to fix CVE-2021-4010. + +CVE: CVE-2021-4010 +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/6c4c530] + +Signed-off-by: Kai Kang + +From 6c4c53010772e3cb4cb8acd54950c8eec9c00d21 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:02 +0200 +Subject: [PATCH] Xext: Fix out of bounds access in SProcScreenSaverSuspend() + +ZDI-CAN-14951, CVE-2021-4010 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + Xext/saver.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Xext/saver.c b/Xext/saver.c +index 1d7e3cadf..f813ba08d 100644 +--- a/Xext/saver.c ++++ b/Xext/saver.c +@@ -1351,8 +1351,8 @@ SProcScreenSaverSuspend(ClientPtr client) + REQUEST(xScreenSaverSuspendReq); + + swaps(&stuff->length); +- swapl(&stuff->suspend); + REQUEST_SIZE_MATCH(xScreenSaverSuspendReq); ++ swapl(&stuff->suspend); + return ProcScreenSaverSuspend(client); + } + +-- +GitLab + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb index ac32bb25c2..84b0acb42f 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb @@ -11,6 +11,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://0001-hw-xwayland-Makefile.am-fix-build-without-glx.patch \ file://CVE-2021-4008.patch \ file://CVE-2021-4009.patch \ + file://CVE-2021-4010.patch \ " SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" From patchwork Wed Jan 5 15:18:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2078 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 EC807C433F5 for ; Wed, 5 Jan 2022 15:19:31 +0000 (UTC) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mx.groups.io with SMTP id smtpd.web12.1720.1641395941760702382 for ; Wed, 05 Jan 2022 07:19:31 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=O0OOcqAN; spf=pass (domain: intel.com, ip: 192.55.52.88, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395971; x=1672931971; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=nKGl3dG2ujihGZ5T0Z2bn2PNx+Ra6tpFTmms8gGbYDY=; b=O0OOcqANblQWF0tcnJ2tOnDpOpCx1n0a9hReVDR1d29WK5q77bwYv4tW zB8bhi1TeOkSJcC+PNmKWBzU0N82tDtVdznCbRmb+9NoYiSsIMmOnj72d AwXfnljwnYW/irmgG5yAwrGJGPYkPPp8kRVv9k7MammKZcq1u6xpyJUWt I8InOwxnd8IuFdd9btNDWHoZmLUWwzwIfv/UNLB9LJuUufIz8hrqSOrb8 Nsn7zjxYjDRuzsrzF5mz4zcG8QWm/xQsNxA4PjcrjKm/JhmDBuTr+ibJa 97g52azZw1mxvRSzIHE1F82hGT6y6m5kpAoFkx/WJxJ1SNr3u0MyMm7Mb w==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="266742857" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="266742857" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:30 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128696" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:27 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 18/24] xserver-xorg: fix CVE-2021-4011 Date: Wed, 5 Jan 2022 23:18:38 +0800 Message-Id: <5f300f2be6453947a37231ced56ca577c91d93b4.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160203 From: Kai Kang Backport patch to fix CVE-2021-4011 for xserver-xorg. CVE: CVE-2021-4011 Signed-off-by: Kai Kang Signed-off-by: Anuj Mittal --- .../xserver-xorg/CVE-2021-4011.patch | 40 +++++++++++++++++++ .../xorg-xserver/xserver-xorg_1.20.10.bb | 1 + 2 files changed, 41 insertions(+) create mode 100644 meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4011.patch diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4011.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4011.patch new file mode 100644 index 0000000000..c7eb03091d --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2021-4011.patch @@ -0,0 +1,40 @@ +Backport patch to fix CVE-2021-4011. + +CVE: CVE-2021-4011 +Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/xserver/-/commit/e56f61c] + +Signed-off-by: Kai Kang + +From e56f61c79fc3cee26d83cda0f84ae56d5979f768 Mon Sep 17 00:00:00 2001 +From: Povilas Kanapickas +Date: Tue, 14 Dec 2021 15:00:00 +0200 +Subject: [PATCH] record: Fix out of bounds access in SwapCreateRegister() + +ZDI-CAN-14952, CVE-2021-4011 + +This vulnerability was discovered and the fix was suggested by: +Jan-Niklas Sohn working with Trend Micro Zero Day Initiative + +Signed-off-by: Povilas Kanapickas +--- + record/record.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/record/record.c b/record/record.c +index be154525d..e123867a7 100644 +--- a/record/record.c ++++ b/record/record.c +@@ -2516,8 +2516,8 @@ SwapCreateRegister(ClientPtr client, xRecordRegisterClientsReq * stuff) + swapl(pClientID); + } + if (stuff->nRanges > +- client->req_len - bytes_to_int32(sz_xRecordRegisterClientsReq) +- - stuff->nClients) ++ (client->req_len - bytes_to_int32(sz_xRecordRegisterClientsReq) ++ - stuff->nClients) / bytes_to_int32(sz_xRecordRange)) + return BadLength; + RecordSwapRanges((xRecordRange *) pClientID, stuff->nRanges); + return Success; +-- +GitLab + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb index 84b0acb42f..58f1eb328e 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.10.bb @@ -12,6 +12,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://CVE-2021-4008.patch \ file://CVE-2021-4009.patch \ file://CVE-2021-4010.patch \ + file://CVE-2021-4011.patch \ " SRC_URI[sha256sum] = "977420c082450dc808de301ef56af4856d653eea71519a973c3490a780cb7c99" From patchwork Wed Jan 5 15:18:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2083 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 F37D7C433EF for ; Wed, 5 Jan 2022 15:19:41 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by mx.groups.io with SMTP id smtpd.web10.1826.1641395980809833143 for ; Wed, 05 Jan 2022 07:19:41 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=ZqtXm/5G; spf=pass (domain: intel.com, ip: 134.134.136.24, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395980; x=1672931980; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=S7Dg+cK7ijsIaHO3TS/Xy148GaXOQBLd/R4COyNQVOc=; b=ZqtXm/5GQHch4eBpeaBCxzH6e6idpcSHEbZB+8od2qc4pb5W/W7MFSJM 6IUyL+qIJypmJJ1ZA1tEtv95PqAm1lMLZpT6AqDX7pd5Gt+MPsDLZPTpV 6pMeT8m+cbJoysmxRpefyzyQO3zMthEBQ1GZT37e4UYjj4paH2F6xvoMj MAeC0cmqnJ33VVZ2xCFt9Et2vIh+TON3EiIGf6S5xeT41KllDICa0zhXj fnxmLCYiJfVOXtU8wIXH55U9iG3S4FkXhtzDIeghMRHbWalBl0a1+H0rY wkwYi3mQVJE12H1DTDtwyragKWV8O5odlizEk8lncoB7xEdjXL4EdI8lm w==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="242260797" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="242260797" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:30 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128701" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:28 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 19/24] binutils: Fix CVE-2021-45078 Date: Wed, 5 Jan 2022 23:18:39 +0800 Message-Id: X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:41 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160207 From: Sundeep KOKKONDA Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=161e87d12167b1e36193385485c1f6ce92f74f02] Signed-off-by: Sundeep KOKKONDA Signed-off-by: Anuj Mittal --- .../binutils/binutils-2.36.inc | 1 + .../binutils/0001-CVE-2021-45078.patch | 255 ++++++++++++++++++ 2 files changed, 256 insertions(+) create mode 100644 meta/recipes-devtools/binutils/binutils/0001-CVE-2021-45078.patch diff --git a/meta/recipes-devtools/binutils/binutils-2.36.inc b/meta/recipes-devtools/binutils/binutils-2.36.inc index e4fdadc70a..9574ddb6e1 100644 --- a/meta/recipes-devtools/binutils/binutils-2.36.inc +++ b/meta/recipes-devtools/binutils/binutils-2.36.inc @@ -47,5 +47,6 @@ SRC_URI = "\ file://0017-CVE-2021-3530.patch \ file://0018-CVE-2021-3530.patch \ file://0001-CVE-2021-42574.patch \ + file://0001-CVE-2021-45078.patch \ " S = "${WORKDIR}/git" diff --git a/meta/recipes-devtools/binutils/binutils/0001-CVE-2021-45078.patch b/meta/recipes-devtools/binutils/binutils/0001-CVE-2021-45078.patch new file mode 100644 index 0000000000..f118e2599b --- /dev/null +++ b/meta/recipes-devtools/binutils/binutils/0001-CVE-2021-45078.patch @@ -0,0 +1,255 @@ +From 161e87d12167b1e36193385485c1f6ce92f74f02 Mon Sep 17 00:00:00 2001 +From: Alan Modra +Date: Wed, 15 Dec 2021 11:48:42 +1030 +Subject: [PATCH] PR28694, Out-of-bounds write in stab_xcoff_builtin_type + + PR 28694 + * stabs.c (stab_xcoff_builtin_type): Make typenum unsigned. + Negate typenum earlier, simplifying bounds checking. Correct + off-by-one indexing. Adjust switch cases. + + +CVE: CVE-2021-45078 +Upstream-Status: Backport [https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=161e87d12167b1e36193385485c1f6ce92f74f02] + +Signed-off-by: Sundeep KOKKONDA +--- + binutils/stabs.c | 87 ++++++++++++++++++++++++------------------------ + 1 file changed, 43 insertions(+), 44 deletions(-) + + +diff --git a/binutils/stabs.c b/binutils/stabs.c +index 274bfb0e7fa..83ee3ea5fa4 100644 +--- a/binutils/stabs.c ++++ b/binutils/stabs.c +@@ -202,7 +202,7 @@ static debug_type stab_find_type (void *, struct stab_handle *, const int *); + static bfd_boolean stab_record_type + (void *, struct stab_handle *, const int *, debug_type); + static debug_type stab_xcoff_builtin_type +- (void *, struct stab_handle *, int); ++ (void *, struct stab_handle *, unsigned int); + static debug_type stab_find_tagged_type + (void *, struct stab_handle *, const char *, int, enum debug_type_kind); + static debug_type *stab_demangle_argtypes +@@ -3496,166 +3496,167 @@ stab_record_type (void *dhandle ATTRIBUTE_UNUSED, struct stab_handle *info, + + static debug_type + stab_xcoff_builtin_type (void *dhandle, struct stab_handle *info, +- int typenum) ++ unsigned int typenum) + { + debug_type rettype; + const char *name; + +- if (typenum >= 0 || typenum < -XCOFF_TYPE_COUNT) ++ typenum = -typenum - 1; ++ if (typenum >= XCOFF_TYPE_COUNT) + { +- fprintf (stderr, _("Unrecognized XCOFF type %d\n"), typenum); ++ fprintf (stderr, _("Unrecognized XCOFF type %d\n"), -typenum - 1); + return DEBUG_TYPE_NULL; + } +- if (info->xcoff_types[-typenum] != NULL) +- return info->xcoff_types[-typenum]; ++ if (info->xcoff_types[typenum] != NULL) ++ return info->xcoff_types[typenum]; + +- switch (-typenum) ++ switch (typenum) + { +- case 1: ++ case 0: + /* The size of this and all the other types are fixed, defined + by the debugging format. */ + name = "int"; + rettype = debug_make_int_type (dhandle, 4, FALSE); + break; +- case 2: ++ case 1: + name = "char"; + rettype = debug_make_int_type (dhandle, 1, FALSE); + break; +- case 3: ++ case 2: + name = "short"; + rettype = debug_make_int_type (dhandle, 2, FALSE); + break; +- case 4: ++ case 3: + name = "long"; + rettype = debug_make_int_type (dhandle, 4, FALSE); + break; +- case 5: ++ case 4: + name = "unsigned char"; + rettype = debug_make_int_type (dhandle, 1, TRUE); + break; +- case 6: ++ case 5: + name = "signed char"; + rettype = debug_make_int_type (dhandle, 1, FALSE); + break; +- case 7: ++ case 6: + name = "unsigned short"; + rettype = debug_make_int_type (dhandle, 2, TRUE); + break; +- case 8: ++ case 7: + name = "unsigned int"; + rettype = debug_make_int_type (dhandle, 4, TRUE); + break; +- case 9: ++ case 8: + name = "unsigned"; + rettype = debug_make_int_type (dhandle, 4, TRUE); + break; +- case 10: ++ case 9: + name = "unsigned long"; + rettype = debug_make_int_type (dhandle, 4, TRUE); + break; +- case 11: ++ case 10: + name = "void"; + rettype = debug_make_void_type (dhandle); + break; +- case 12: ++ case 11: + /* IEEE single precision (32 bit). */ + name = "float"; + rettype = debug_make_float_type (dhandle, 4); + break; +- case 13: ++ case 12: + /* IEEE double precision (64 bit). */ + name = "double"; + rettype = debug_make_float_type (dhandle, 8); + break; +- case 14: ++ case 13: + /* This is an IEEE double on the RS/6000, and different machines + with different sizes for "long double" should use different + negative type numbers. See stabs.texinfo. */ + name = "long double"; + rettype = debug_make_float_type (dhandle, 8); + break; +- case 15: ++ case 14: + name = "integer"; + rettype = debug_make_int_type (dhandle, 4, FALSE); + break; +- case 16: ++ case 15: + name = "boolean"; + rettype = debug_make_bool_type (dhandle, 4); + break; +- case 17: ++ case 16: + name = "short real"; + rettype = debug_make_float_type (dhandle, 4); + break; +- case 18: ++ case 17: + name = "real"; + rettype = debug_make_float_type (dhandle, 8); + break; +- case 19: ++ case 18: + /* FIXME */ + name = "stringptr"; + rettype = NULL; + break; +- case 20: ++ case 19: + /* FIXME */ + name = "character"; + rettype = debug_make_int_type (dhandle, 1, TRUE); + break; +- case 21: ++ case 20: + name = "logical*1"; + rettype = debug_make_bool_type (dhandle, 1); + break; +- case 22: ++ case 21: + name = "logical*2"; + rettype = debug_make_bool_type (dhandle, 2); + break; +- case 23: ++ case 22: + name = "logical*4"; + rettype = debug_make_bool_type (dhandle, 4); + break; +- case 24: ++ case 23: + name = "logical"; + rettype = debug_make_bool_type (dhandle, 4); + break; +- case 25: ++ case 24: + /* Complex type consisting of two IEEE single precision values. */ + name = "complex"; + rettype = debug_make_complex_type (dhandle, 8); + break; +- case 26: ++ case 25: + /* Complex type consisting of two IEEE double precision values. */ + name = "double complex"; + rettype = debug_make_complex_type (dhandle, 16); + break; +- case 27: ++ case 26: + name = "integer*1"; + rettype = debug_make_int_type (dhandle, 1, FALSE); + break; +- case 28: ++ case 27: + name = "integer*2"; + rettype = debug_make_int_type (dhandle, 2, FALSE); + break; +- case 29: ++ case 28: + name = "integer*4"; + rettype = debug_make_int_type (dhandle, 4, FALSE); + break; +- case 30: ++ case 29: + /* FIXME */ + name = "wchar"; + rettype = debug_make_int_type (dhandle, 2, FALSE); + break; +- case 31: ++ case 30: + name = "long long"; + rettype = debug_make_int_type (dhandle, 8, FALSE); + break; +- case 32: ++ case 31: + name = "unsigned long long"; + rettype = debug_make_int_type (dhandle, 8, TRUE); + break; +- case 33: ++ case 32: + name = "logical*8"; + rettype = debug_make_bool_type (dhandle, 8); + break; +- case 34: ++ case 33: + name = "integer*8"; + rettype = debug_make_int_type (dhandle, 8, FALSE); + break; +@@ -3664,9 +3665,7 @@ stab_xcoff_builtin_type (void *dhandle, struct stab_handle *info, + } + + rettype = debug_name_type (dhandle, name, rettype); +- +- info->xcoff_types[-typenum] = rettype; +- ++ info->xcoff_types[typenum] = rettype; + return rettype; + } + +-- +2.27.0 + From patchwork Wed Jan 5 15:18:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2081 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 F147BC433FE for ; Wed, 5 Jan 2022 15:19:33 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web12.1733.1641395973368105348 for ; Wed, 05 Jan 2022 07:19:33 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=OVfDFjh6; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395973; x=1672931973; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=+F2nRPAbmyHeo5ccAnuxnzamNTBpy3eib5nGkwVRlOk=; b=OVfDFjh6fVGQOSjjIYYrnLk6yr9QZ+a5zoYnGfMBbbGYF1jx4/GfaUMw FuAvPDw1mWcW8O6I7Az43GZ3g+mlIBIGHX7VA3XUxquixtH9fFjqrlS+K eoABcZyjBZgGk0A6Uf3iXgZVZaRKNi///zOZGZYHcaJAKMd3a2F95n+9D gJRUpjPAACqHbDxnjtSzIhUjWJdu+pmW5orIbpzl/1gtP5p6V8C1C47aR jC3aUvCtFDr1CCKT7MHyImWokJtLAGadP5Ie15eMciTqV/onFBq+w5Sil 2X48vc4BafYIgDv0sLiuvsD6By+dIhLGsw2Q22gLd4ojJOt2R2UKoCjQu w==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="223147024" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="223147024" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:32 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128703" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:30 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 20/24] selftest: skip virgl test on centos 8 entirely Date: Wed, 5 Jan 2022 23:18:40 +0800 Message-Id: <125f62204a14ff11becb6db9d412d1abece930aa.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160205 From: Steve Sakoman With the sdl frontend, qemu isn't able to even boot fully, so let's skip the test early. Signed-off-by: Steve Sakoman (cherry picked from commit 74bb94a7d249b5c53f3e1d15688a3a323fc8e828) Signed-off-by: Anuj Mittal --- meta/lib/oeqa/selftest/cases/runtime_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index b20c5b427b..668e978f17 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -185,6 +185,8 @@ class TestImage(OESelftestTestCase): self.skipTest('virgl isn\'t working with Debian 9') if distro and distro == 'centos-7': self.skipTest('virgl isn\'t working with Centos 7') + if distro and distro == 'centos-8': + self.skipTest('virgl isn\'t working with Centos 8') if distro and distro == 'opensuseleap-15.0': self.skipTest('virgl isn\'t working with Opensuse 15.0') From patchwork Wed Jan 5 15:18:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2080 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 EB068C433EF for ; Wed, 5 Jan 2022 15:19:33 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web12.1733.1641395973368105348 for ; Wed, 05 Jan 2022 07:19:33 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=AFYF6dKU; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395973; x=1672931973; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=5xuVkf1Gj9XqL0pFRKmdzV20VR4MVtq4D60bsKPTd4Q=; b=AFYF6dKUHWqGe5xabcMK4QqfHhJhMJOFMF5ivZmagcCcFLoAsYwI4zeU bqfky3/w/4vhFDO8OtVdeJpSvcckLWXsaZ0tWxdZg7dxgxaxJcVcmNKXt KfBquFX3RrEKS21RTlQnp/YB+QTNzgRPnfMp5IO3CAgKSq3pMSgVjcou/ aBx/FuOIxrs2qIS6+CGn5McEbrsUWq1mi7w6YlLnflewWe+5nHoLJwSsO MlRaQMX80SJlyDVevlntGH/zF+ivQiYpsxGZwMnKG/YMG7yyYF/BaM52b 6pRSnnjOLp4UMuWbcfaxbqhHezHIMzTFPdgeaViTctyDEH3apZfaugoPx A==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="223147025" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="223147025" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:32 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128708" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:31 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 21/24] selftest: skip virgl test on fedora 34 entirely Date: Wed, 5 Jan 2022 23:18:41 +0800 Message-Id: X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:33 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160204 From: Steve Sakoman Fedora 34 recently updated libdrm to 2.4.109 and this test will fail any time the host has libdrm > 2.4.107 Signed-off-by: Steve Sakoman (cherry picked from commit 1ab7aee542589f6b6c76f8515b4230ce870a8678) Signed-off-by: Anuj Mittal --- meta/lib/oeqa/selftest/cases/runtime_test.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 668e978f17..2148e84ff3 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -187,6 +187,8 @@ class TestImage(OESelftestTestCase): self.skipTest('virgl isn\'t working with Centos 7') if distro and distro == 'centos-8': self.skipTest('virgl isn\'t working with Centos 8') + if distro and distro == 'fedora-34': + self.skipTest('virgl isn\'t working with Fedora 34') if distro and distro == 'opensuseleap-15.0': self.skipTest('virgl isn\'t working with Opensuse 15.0') From patchwork Wed Jan 5 15:18:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2082 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 ED15BC4332F for ; Wed, 5 Jan 2022 15:19:34 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web12.1733.1641395973368105348 for ; Wed, 05 Jan 2022 07:19:34 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=UPhaXLn7; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395974; x=1672931974; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=Klu0vJlr7j9sLLEfbixFn9/ZEfqAfbR4OAw+Y2gMUWc=; b=UPhaXLn74Eyy7Q3z66GJ6XcgdfvvdwX4Vtjne0uH5wlKSw3eMQgSdmP+ H4IB6QbnQNyC+a61gzJnCbnOJa8QRDXTk7qHTI6H/xZr1FK+1/GAtLHZi anEUFDsTWBJJRxbaNC54Uv200gA/EuVEuW+37gjSUYAQv1iongOVU4vl+ 2851NiaITM8edO/CHpl6q3WMbm4pqO6xRWezPoHp8WtKogocrblvJfGlN fkAaChfxCk8UyZuSOb7mfcpsmUfkZNLeTfxCRZEwZzveE04DFo3VpVKVg YZ6N2wie6zbU2crhhRgSXiYaxQv/nd2W4roe1xxUftevLrDNQLBRA7VnT Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="223147030" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="223147030" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:34 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128713" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:32 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 22/24] xserver-xorg: update CVE_PRODUCT Date: Wed, 5 Jan 2022 23:18:42 +0800 Message-Id: <1f86315f5993ddaafddb99da536bb1a51786fe59.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160206 Some of the CVEs have x_server as the product name. Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie (cherry picked from commit 4d5d63cf8605515bb659b6b732683d7fe6540728) Signed-off-by: Anuj Mittal --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index b3e03744c0..497515a04a 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -17,7 +17,7 @@ PE = "2" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" -CVE_PRODUCT = "xorg-server" +CVE_PRODUCT = "xorg-server x_server" S = "${WORKDIR}/${XORG_PN}-${PV}" From patchwork Wed Jan 5 15:18:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2084 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 EF37DC433EF for ; Wed, 5 Jan 2022 15:19:44 +0000 (UTC) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by mx.groups.io with SMTP id smtpd.web09.1687.1641395981015725535 for ; Wed, 05 Jan 2022 07:19:44 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=JZfgglnh; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395984; x=1672931984; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=3MCTX6gFy/3LMFyFJ35mVtTAE40+Fs0Xb0e6pS7gtcY=; b=JZfgglnhKORnigD6KvOzS6WTDIspNitniaEBNCiiUIxyiToDcfntz8I0 8N2f1IH5wrczX+T5CPIYkj5M8oZZGr/iof79bxDU0s1/pOVBS7HJY/Xv9 f452UN3/3YazNTARP2maSEkmlsqeJjInn7kXN6ZU39UDrwMOji5l96uI3 nKKdKyfyPvhsXD0pZpeMqpzES/rCqMp76Zk/6i3KA8QlkdmBYsTJEQ0X6 Zzps7Jztwqqi/PWxhhaAWtQZPddRvecwjPvkdTuO3iKKJJCz/HM62xK/R zKt5XXC04i3K25zBoVTFES6VLPTQxNv+zKK5UqiMLg1bC3PQEKcQ47tvW Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="223147038" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="223147038" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:39 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128716" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:34 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 23/24] webkitgtk: Add reproducibility fix Date: Wed, 5 Jan 2022 23:18:43 +0800 Message-Id: <922db800adf7b616592b48e5e7bd295efeb2e206.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160208 From: Richard Purdie When the date rolled from one year to another this highlighted a reproducibility issue. This could be better fixed by using SOURCE_DATE_EPOCH from the environment but I'm not sure how you do that in ruby. Help from someone with that knowledge to submit that upstream very welcome. Signed-off-by: Richard Purdie (cherry picked from commit 4d561c98f4d2e68d595aae4b03df1420cb01c3f7) Signed-off-by: Anuj Mittal --- .../webkit/webkitgtk/reproducibility.patch | 22 +++++++++++++++++++ meta/recipes-sato/webkit/webkitgtk_2.30.5.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/reproducibility.patch diff --git a/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch new file mode 100644 index 0000000000..e866a1a193 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/reproducibility.patch @@ -0,0 +1,22 @@ +Injection a year based on the current date isn't reproducible. Hack this +to a specific year for now for reproducibilty and to avoid autobuilder failures. + +The correct fix would be to use SOURCE_DATE_EPOCH from the environment and +then this could be submitted upstream, sadly my ruby isn't up to that. + +Upstream-Status: Pending [could be reworked] +Signed-off-by: Richard Purdie + +Index: webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb +=================================================================== +--- webkitgtk-2.34.2.orig/Source/JavaScriptCore/generator/GeneratedFile.rb ++++ webkitgtk-2.34.2/Source/JavaScriptCore/generator/GeneratedFile.rb +@@ -25,7 +25,7 @@ require 'date' + require 'digest' + + $LICENSE = <<-EOF +-Copyright (C) #{Date.today.year} Apple Inc. All rights reserved. ++Copyright (C) 2021 Apple Inc. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions diff --git a/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb b/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb index 1fefc75c49..88b5056165 100644 --- a/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb +++ b/meta/recipes-sato/webkit/webkitgtk_2.30.5.bb @@ -21,6 +21,7 @@ SRC_URI = "https://www.webkitgtk.org/releases/${BPN}-${PV}.tar.xz \ file://0001-Extend-atomics-check-to-include-1-byte-CAS-test.patch \ file://musl-lower-stack-usage.patch \ file://0001-MiniBrowser-Fix-reproduciblity.patch \ + file://reproducibility.patch \ " SRC_URI[sha256sum] = "7d0dab08e3c5ae07bec80b2822ef42e952765d5724cac86eb23999bfed5a7f1f" From patchwork Wed Jan 5 15:18:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Mittal, Anuj" X-Patchwork-Id: 2085 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 EF5E7C433EF for ; Wed, 5 Jan 2022 15:19:52 +0000 (UTC) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mx.groups.io with SMTP id smtpd.web08.1738.1641395992152460440 for ; Wed, 05 Jan 2022 07:19:52 -0800 Authentication-Results: mx.groups.io; dkim=fail reason="unable to parse pub key" header.i=@intel.com header.s=intel header.b=M89TLf1d; spf=pass (domain: intel.com, ip: 134.134.136.31, mailfrom: anuj.mittal@intel.com) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1641395992; x=1672931992; h=from:to:subject:date:message-id:in-reply-to:references: mime-version:content-transfer-encoding; bh=scA/iai6nK8YnXAe1Re3DHbYmKWtOOr4RzJE9ysZKU0=; b=M89TLf1d+qeR3w+YkIDtDyrQfB9xhPFxj9XdHPhT3gKP3zQMtgxUsQyM WCbUQxjEtZu8icap8TtZXBnFqtWqTLP4mzt9vkfphqBoQJUKGJ3bscgeX tAHTrtM90qmkWtANQJVvwzskhkB4cZWwEr3w+kyoXm8Mnb7wYcCDvmgVJ BqZNEayw/DoK6+Py5Rre3ncvpzVqgmJPcWdJ43+Nn3FQcdn0KQl+ugLZ4 QepToYiqVSjFXOmPHMXIV6iCcGEX+LsQhkdUqSXrkYSEyfeFQvW9h6oMG 8SZpRg/B0zTlHRQYfI54ju6DUWJv+CxxHh2R3eHNQ6oT9ufn+m1h5UnAs A==; X-IronPort-AV: E=McAfee;i="6200,9189,10217"; a="303215210" X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="303215210" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:37 -0800 X-IronPort-AV: E=Sophos;i="5.88,264,1635231600"; d="scan'208";a="668128719" Received: from hanwenlx-mobl1.gar.corp.intel.com (HELO anmitta2-mobl3.intel.com) ([10.213.129.44]) by fmsmga001-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jan 2022 07:19:36 -0800 From: Anuj Mittal To: openembedded-core@lists.openembedded.org Subject: [hardknott][PATCH 24/24] openssl: Add reproducibility fix Date: Wed, 5 Jan 2022 23:18:44 +0800 Message-Id: <8502242b5caa24fe1aeffa8bd5f048ebdb5f6610.1641395036.git.anuj.mittal@intel.com> X-Mailer: git-send-email 2.33.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 ; Wed, 05 Jan 2022 15:19:52 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/160209 From: Richard Purdie When the date rolled from one year to another, it highlighted a reproducibility issue in openssl. Patch a workaround for this to avoid autobuilder failures. Help submitting upstream welcome. Signed-off-by: Richard Purdie (cherry picked from commit f8281e290737dba16a46d7ae937c66b3266e0fe8) Signed-off-by: Anuj Mittal --- .../openssl/openssl/reproducibility.patch | 22 +++++++++++++++++++ .../openssl/openssl_1.1.1l.bb | 1 + 2 files changed, 23 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/reproducibility.patch diff --git a/meta/recipes-connectivity/openssl/openssl/reproducibility.patch b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch new file mode 100644 index 0000000000..8accbc9df2 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/reproducibility.patch @@ -0,0 +1,22 @@ +Using localtime() means the output can depend on the timezone of the build machine. +Using gmtime() is safer. For complete reproducibility use SOURCE_DATE_EPOCH if set. + +Signed-off-by: Richard Purdie +Upstream-Status: Pending [should be suitable] + +Index: openssl-3.0.1/apps/progs.pl +=================================================================== +--- openssl-3.0.1.orig/apps/progs.pl ++++ openssl-3.0.1/apps/progs.pl +@@ -21,7 +21,10 @@ die "Unrecognised option, must be -C or + my %commands = (); + my $cmdre = qr/^\s*int\s+([a-z_][a-z0-9_]*)_main\(\s*int\s+argc\s*,/; + my $apps_openssl = shift @ARGV; +-my $YEAR = [localtime()]->[5] + 1900; ++my $YEAR = [gmtime()]->[5] + 1900; ++if (defined($ENV{SOURCE_DATE_EPOCH}) && $ENV{SOURCE_DATE_EPOCH} !~ /\D/) { ++ $YEAR = [gmtime($ENV{SOURCE_DATE_EPOCH})]->[5] + 1900; ++} + + # because the program apps/openssl has object files as sources, and + # they then have the corresponding C files as source, we need to chain diff --git a/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb b/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb index 9ea5c4c81f..50500eebc2 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.1.1l.bb @@ -17,6 +17,7 @@ SRC_URI = "http://www.openssl.org/source/openssl-${PV}.tar.gz \ file://0001-buildinfo-strip-sysroot-and-debug-prefix-map-from-co.patch \ file://afalg.patch \ file://reproducible.patch \ + file://reproducibility.patch \ " SRC_URI_append_class-nativesdk = " \