Patch review
cover Patch review
Please review this set of patches for dunfell and have comments back by end of day Monday.
Passed a-full on autobuilder:
https://autobuilder.yoctoproject.org/typhoon/#/builders/83/builds/3141
The following changes since commit 01f256bc72fb45c80b6a6c77506bc4c375965a3a:
glibc: Add fix for data races in pthread_create and TLS access (2022-01-12 04:37:31 -1000)
are available in the Git repository at:
git://git.openembedded.org/openembedded-core-contrib stable/dunfell-nut
http://cgit.openembedded.org/openembedded-core-contrib/log/?h=stable/dunfell-nut
Bruce Ashfield (5):
linux-yocto/5.4: update to v5.4.169
linux-yocto/5.4: update to v5.4.170
linux-yocto/5.4: update to v5.4.171
linux-yocto/5.4: update to v5.4.172
kernel: introduce python3-dtschema-wrapper
Kai Kang (1):
speex: fix CVE-2020-23903
Marek Vasut (1):
Revert "weston: Use systemd notify,"
Richard Purdie (1):
lttng-tools: Add missing DEPENDS on bison-native
Steve Sakoman (3):
expat fix CVE-2022-22822 through CVE-2022-22827
expat: fix CVE-2021-45960
expat: fix CVE-2021-46143
meta/conf/distro/include/maintainers.inc | 1 + .../expat/expat/CVE-2021-45960.patch | 65 +++++ .../expat/expat/CVE-2021-46143.patch | 43 +++ .../expat/expat/CVE-2022-22822-27.patch | 257 ++++++++++++++++++ meta/recipes-core/expat/expat_2.2.9.bb | 3 + .../wayland/weston-init/weston-start | 12 - .../wayland/weston-init/[email protected] | 6 - .../weston/systemd-notify.weston-start | 9 - .../wayland/weston/xwayland.weston-start | 3 +- meta/recipes-graphics/wayland/weston_8.0.0.bb | 6 - .../python3-dtschema-wrapper/dt-doc-validate | 20 ++ .../dtc/python3-dtschema-wrapper/dt-mk-schema | 20 ++ .../dtc/python3-dtschema-wrapper/dt-validate | 20 ++ .../dtc/python3-dtschema-wrapper_2021.10.bb | 17 ++ .../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 +- .../lttng/lttng-tools_2.11.5.bb | 2 +- .../speex/speex/CVE-2020-23903.patch | 30 ++ meta/recipes-multimedia/speex/speex_1.2.0.bb | 4 +- 20 files changed, 500 insertions(+), 54 deletions(-) create mode 100644 meta/recipes-core/expat/expat/CVE-2021-45960.patch create mode 100644 meta/recipes-core/expat/expat/CVE-2021-46143.patch create mode 100644 meta/recipes-core/expat/expat/CVE-2022-22822-27.patch delete mode 100644 meta/recipes-graphics/wayland/weston/systemd-notify.weston-start create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-doc-validate create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb create mode 100644 meta/recipes-multimedia/speex/speex/CVE-2020-23903.patch
Signature · 1 line
2.25.1
PATCH 1/11 expat fix CVE-2022-22822 through CVE-2022-22827
xmlparse.c has multiple integer overflows. The involved functions are:
- addBinding (CVE-2022-22822)
- build_model (CVE-2022-22823)
- defineAttribute (CVE-2022-22824)
- lookup (CVE-2022-22825)
- nextScaffoldPart (CVE-2022-22826)
- storeAtts (CVE-2022-22827)
Backport patch from:
https://github.com/libexpat/libexpat/pull/539/commits/9f93e8036e842329863bf20395b8fb8f73834d9e
CVE: CVE-2022-22822 CVE-2022-22823 CVE-2022-22824 CVE-2022-22825 CVE-2022-22826 CVE-2022-22827
--- .../expat/expat/CVE-2022-22822-27.patch | 257 ++++++++++++++++++ meta/recipes-core/expat/expat_2.2.9.bb | 1 + 2 files changed, 258 insertions(+) create mode 100644 meta/recipes-core/expat/expat/CVE-2022-22822-27.patch
meta/recipes-core/expat/expat/CVE-2022-22822-27.patch new file +257 -0
@@ -0,0 +1,257 @@ +From 9f93e8036e842329863bf20395b8fb8f73834d9e Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <[email protected]> +Date: Thu, 30 Dec 2021 22:46:03 +0100 +Subject: [PATCH] lib: Prevent integer overflow at multiple places + (CVE-2022-22822 to CVE-2022-22827) + +The involved functions are: +- addBinding (CVE-2022-22822) +- build_model (CVE-2022-22823) +- defineAttribute (CVE-2022-22824) +- lookup (CVE-2022-22825) +- nextScaffoldPart (CVE-2022-22826) +- storeAtts (CVE-2022-22827) + +Upstream-Status: Backport: +https://github.com/libexpat/libexpat/pull/539/commits/9f93e8036e842329863bf20395b8fb8f73834d9e + +CVE: CVE-2022-22822 CVE-2022-22823 CVE-2022-22824 CVE-2022-22825 CVE-2022-22826 CVE-2022-22827 +Signed-off-by: Steve Sakoman <[email protected]> + +--- + expat/lib/xmlparse.c | 153 ++++++++++++++++++++++++++++++++++++++++++- + 1 file changed, 151 insertions(+), 2 deletions(-) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index 8f243126..575e73ee 100644 +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -3261,13 +3261,38 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr, + + /* get the attributes from the tokenizer */ + n = XmlGetAttributes(enc, attStr, parser->m_attsSize, parser->m_atts); ++ ++ /* Detect and prevent integer overflow */ ++ if (n > INT_MAX - nDefaultAtts) { ++ return XML_ERROR_NO_MEMORY; ++ } ++ + if (n + nDefaultAtts > parser->m_attsSize) { + int oldAttsSize = parser->m_attsSize; + ATTRIBUTE *temp; + #ifdef XML_ATTR_INFO + XML_AttrInfo *temp2; + #endif ++ ++ /* Detect and prevent integer overflow */ ++ if ((nDefaultAtts > INT_MAX - INIT_ATTS_SIZE) ++ || (n > INT_MAX - (nDefaultAtts + INIT_ATTS_SIZE))) { ++ return XML_ERROR_NO_MEMORY; ++ } ++ + parser->m_attsSize = n + nDefaultAtts + INIT_ATTS_SIZE; ++ ++ /* Detect and prevent integer overflow. ++ * The preprocessor guard addresses the "always false" warning ++ * from -Wtype-limits on platforms where ++ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */ ++#if UINT_MAX >= SIZE_MAX ++ if ((unsigned)parser->m_attsSize > (size_t)(-1) / sizeof(ATTRIBUTE)) { ++ parser->m_attsSize = oldAttsSize; ++ return XML_ERROR_NO_MEMORY; ++ } ++#endif ++ + temp = (ATTRIBUTE *)REALLOC(parser, (void *)parser->m_atts, + parser->m_attsSize * sizeof(ATTRIBUTE)); + if (temp == NULL) { +@@ -3276,6 +3301,17 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr, + } + parser->m_atts = temp; + #ifdef XML_ATTR_INFO ++ /* Detect and prevent integer overflow. ++ * The preprocessor guard addresses the "always false" warning ++ * from -Wtype-limits on platforms where ++ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */ ++# if UINT_MAX >= SIZE_MAX ++ if ((unsigned)parser->m_attsSize > (size_t)(-1) / sizeof(XML_AttrInfo)) { ++ parser->m_attsSize = oldAttsSize; ++ return XML_ERROR_NO_MEMORY; ++ } ++# endif ++ + temp2 = (XML_AttrInfo *)REALLOC(parser, (void *)parser->m_attInfo, + parser->m_attsSize * sizeof(XML_AttrInfo)); + if (temp2 == NULL) { +@@ -3610,9 +3646,31 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr, + tagNamePtr->prefixLen = prefixLen; + for (i = 0; localPart[i++];) + ; /* i includes null terminator */ ++ ++ /* Detect and prevent integer overflow */ ++ if (binding->uriLen > INT_MAX - prefixLen ++ || i > INT_MAX - (binding->uriLen + prefixLen)) { ++ return XML_ERROR_NO_MEMORY; ++ } ++ + n = i + binding->uriLen + prefixLen; + if (n > binding->uriAlloc) { + TAG *p; ++ ++ /* Detect and prevent integer overflow */ ++ if (n > INT_MAX - EXPAND_SPARE) { ++ return XML_ERROR_NO_MEMORY; ++ } ++ /* Detect and prevent integer overflow. ++ * The preprocessor guard addresses the "always false" warning ++ * from -Wtype-limits on platforms where ++ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */ ++#if UINT_MAX >= SIZE_MAX ++ if ((unsigned)(n + EXPAND_SPARE) > (size_t)(-1) / sizeof(XML_Char)) { ++ return XML_ERROR_NO_MEMORY; ++ } ++#endif ++ + uri = (XML_Char *)MALLOC(parser, (n + EXPAND_SPARE) * sizeof(XML_Char)); + if (! uri) + return XML_ERROR_NO_MEMORY; +@@ -3708,6 +3766,21 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId, + if (parser->m_freeBindingList) { + b = parser->m_freeBindingList; + if (len > b->uriAlloc) { ++ /* Detect and prevent integer overflow */ ++ if (len > INT_MAX - EXPAND_SPARE) { ++ return XML_ERROR_NO_MEMORY; ++ } ++ ++ /* Detect and prevent integer overflow. ++ * The preprocessor guard addresses the "always false" warning ++ * from -Wtype-limits on platforms where ++ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */ ++#if UINT_MAX >= SIZE_MAX ++ if ((unsigned)(len + EXPAND_SPARE) > (size_t)(-1) / sizeof(XML_Char)) { ++ return XML_ERROR_NO_MEMORY; ++ } ++#endif ++ + XML_Char *temp = (XML_Char *)REALLOC( + parser, b->uri, sizeof(XML_Char) * (len + EXPAND_SPARE)); + if (temp == NULL) +@@ -3720,6 +3793,21 @@ addBinding(XML_Parser parser, PREFIX *prefix, const ATTRIBUTE_ID *attId, + b = (BINDING *)MALLOC(parser, sizeof(BINDING)); + if (! b) + return XML_ERROR_NO_MEMORY; ++ ++ /* Detect and prevent integer overflow */ ++ if (len > INT_MAX - EXPAND_SPARE) { ++ return XML_ERROR_NO_MEMORY; ++ } ++ /* Detect and prevent integer overflow. ++ * The preprocessor guard addresses the "always false" warning ++ * from -Wtype-limits on platforms where ++ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */ ++#if UINT_MAX >= SIZE_MAX ++ if ((unsigned)(len + EXPAND_SPARE) > (size_t)(-1) / sizeof(XML_Char)) { ++ return XML_ERROR_NO_MEMORY; ++ } ++#endif ++ + b->uri + = (XML_Char *)MALLOC(parser, sizeof(XML_Char) * (len + EXPAND_SPARE)); + if (! b->uri) { +@@ -6141,7 +6229,24 @@ defineAttribute(ELEMENT_TYPE *type, ATTRIBUTE_ID *attId, XML_Bool isCdata, + } + } else { + DEFAULT_ATTRIBUTE *temp; ++ ++ /* Detect and prevent integer overflow */ ++ if (type->allocDefaultAtts > INT_MAX / 2) { ++ return 0; ++ } ++ + int count = type->allocDefaultAtts * 2; ++ ++ /* Detect and prevent integer overflow. ++ * The preprocessor guard addresses the "always false" warning ++ * from -Wtype-limits on platforms where ++ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */ ++#if UINT_MAX >= SIZE_MAX ++ if ((unsigned)count > (size_t)(-1) / sizeof(DEFAULT_ATTRIBUTE)) { ++ return 0; ++ } ++#endif ++ + temp = (DEFAULT_ATTRIBUTE *)REALLOC(parser, type->defaultAtts, + (count * sizeof(DEFAULT_ATTRIBUTE))); + if (temp == NULL) +@@ -6792,8 +6897,20 @@ lookup(XML_Parser parser, HASH_TABLE *table, KEY name, size_t createSize) { + /* check for overflow (table is half full) */ + if (table->used >> (table->power - 1)) { + unsigned char newPower = table->power + 1; ++ ++ /* Detect and prevent invalid shift */ ++ if (newPower >= sizeof(unsigned long) * 8 /* bits per byte */) { ++ return NULL; ++ } ++ + size_t newSize = (size_t)1 << newPower; + unsigned long newMask = (unsigned long)newSize - 1; ++ ++ /* Detect and prevent integer overflow */ ++ if (newSize > (size_t)(-1) / sizeof(NAMED *)) { ++ return NULL; ++ } ++ + size_t tsize = newSize * sizeof(NAMED *); + NAMED **newV = (NAMED **)table->mem->malloc_fcn(tsize); + if (! newV) +@@ -7143,6 +7260,20 @@ nextScaffoldPart(XML_Parser parser) { + if (dtd->scaffCount >= dtd->scaffSize) { + CONTENT_SCAFFOLD *temp; + if (dtd->scaffold) { ++ /* Detect and prevent integer overflow */ ++ if (dtd->scaffSize > UINT_MAX / 2u) { ++ return -1; ++ } ++ /* Detect and prevent integer overflow. ++ * The preprocessor guard addresses the "always false" warning ++ * from -Wtype-limits on platforms where ++ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */ ++#if UINT_MAX >= SIZE_MAX ++ if (dtd->scaffSize > (size_t)(-1) / 2u / sizeof(CONTENT_SCAFFOLD)) { ++ return -1; ++ } ++#endif ++ + temp = (CONTENT_SCAFFOLD *)REALLOC( + parser, dtd->scaffold, dtd->scaffSize * 2 * sizeof(CONTENT_SCAFFOLD)); + if (temp == NULL) +@@ -7212,8 +7343,26 @@ build_model(XML_Parser parser) { + XML_Content *ret; + XML_Content *cpos; + XML_Char *str; +- int allocsize = (dtd->scaffCount * sizeof(XML_Content) +- + (dtd->contentStringLen * sizeof(XML_Char))); ++ ++ /* Detect and prevent integer overflow. ++ * The preprocessor guard addresses the "always false" warning ++ * from -Wtype-limits on platforms where ++ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */ ++#if UINT_MAX >= SIZE_MAX ++ if (dtd->scaffCount > (size_t)(-1) / sizeof(XML_Content)) { ++ return NULL; ++ } ++ if (dtd->contentStringLen > (size_t)(-1) / sizeof(XML_Char)) { ++ return NULL; ++ } ++#endif ++ if (dtd->scaffCount * sizeof(XML_Content) ++ > (size_t)(-1) - dtd->contentStringLen * sizeof(XML_Char)) { ++ return NULL; ++ } ++ ++ const size_t allocsize = (dtd->scaffCount * sizeof(XML_Content) ++ + (dtd->contentStringLen * sizeof(XML_Char))); + + ret = (XML_Content *)MALLOC(parser, allocsize); + if (! ret)
meta/recipes-core/expat/expat_2.2.9.bb +1 -0
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" SRC_URI = "git://github.com/libexpat/libexpat.git;protocol=https;branch=master \ file://CVE-2013-0340.patch \ + file://CVE-2022-22822-27.patch \ file://libtool-tag.patch \ "
Signature · 1 line
2.25.1
PATCH 2/11 expat: fix CVE-2021-45960
In reply to Steve SakomanIn Expat (aka libexpat) before 2.4.3, a left shift by 29 (or more) places in the storeAtts function in xmlparse.c can lead to realloc misbehavior (e.g., allocating too few bytes, or only freeing memory).
Backport patch from:
https://github.com/libexpat/libexpat/pull/534/commits/0adcb34c49bee5b19bd29b16a578c510c23597ea
CVE: CVE-2021-45960
--- .../expat/expat/CVE-2021-45960.patch | 65 +++++++++++++++++++ meta/recipes-core/expat/expat_2.2.9.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-core/expat/expat/CVE-2021-45960.patch
meta/recipes-core/expat/expat/CVE-2021-45960.patch new file +65 -0
@@ -0,0 +1,65 @@ +From 0adcb34c49bee5b19bd29b16a578c510c23597ea Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <[email protected]> +Date: Mon, 27 Dec 2021 20:15:02 +0100 +Subject: [PATCH] lib: Detect and prevent troublesome left shifts in function + storeAtts (CVE-2021-45960) + +Upstream-Status: Backport: +https://github.com/libexpat/libexpat/pull/534/commits/0adcb34c49bee5b19bd29b16a578c510c23597ea + +CVE: CVE-2021-45960 +Signed-off-by: Steve Sakoman <[email protected]> + +--- + expat/lib/xmlparse.c | 31 +++++++++++++++++++++++++++++-- + 1 file changed, 29 insertions(+), 2 deletions(-) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index d730f41c3..b47c31b05 100644 +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -3414,7 +3414,13 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr, + if (nPrefixes) { + int j; /* hash table index */ + unsigned long version = parser->m_nsAttsVersion; +- int nsAttsSize = (int)1 << parser->m_nsAttsPower; ++ ++ /* Detect and prevent invalid shift */ ++ if (parser->m_nsAttsPower >= sizeof(unsigned int) * 8 /* bits per byte */) { ++ return XML_ERROR_NO_MEMORY; ++ } ++ ++ unsigned int nsAttsSize = 1u << parser->m_nsAttsPower; + unsigned char oldNsAttsPower = parser->m_nsAttsPower; + /* size of hash table must be at least 2 * (# of prefixed attributes) */ + if ((nPrefixes << 1) +@@ -3425,7 +3431,28 @@ storeAtts(XML_Parser parser, const ENCODING *enc, const char *attStr, + ; + if (parser->m_nsAttsPower < 3) + parser->m_nsAttsPower = 3; +- nsAttsSize = (int)1 << parser->m_nsAttsPower; ++ ++ /* Detect and prevent invalid shift */ ++ if (parser->m_nsAttsPower >= sizeof(nsAttsSize) * 8 /* bits per byte */) { ++ /* Restore actual size of memory in m_nsAtts */ ++ parser->m_nsAttsPower = oldNsAttsPower; ++ return XML_ERROR_NO_MEMORY; ++ } ++ ++ nsAttsSize = 1u << parser->m_nsAttsPower; ++ ++ /* Detect and prevent integer overflow. ++ * The preprocessor guard addresses the "always false" warning ++ * from -Wtype-limits on platforms where ++ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */ ++#if UINT_MAX >= SIZE_MAX ++ if (nsAttsSize > (size_t)(-1) / sizeof(NS_ATT)) { ++ /* Restore actual size of memory in m_nsAtts */ ++ parser->m_nsAttsPower = oldNsAttsPower; ++ return XML_ERROR_NO_MEMORY; ++ } ++#endif ++ + temp = (NS_ATT *)REALLOC(parser, parser->m_nsAtts, + nsAttsSize * sizeof(NS_ATT)); + if (! temp) {
meta/recipes-core/expat/expat_2.2.9.bb +1 -0
@@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" SRC_URI = "git://github.com/libexpat/libexpat.git;protocol=https;branch=master \ file://CVE-2013-0340.patch \ + file://CVE-2021-45960.patch \ file://CVE-2022-22822-27.patch \ file://libtool-tag.patch \ "
Signature · 1 line
2.25.1
PATCH 3/11 expat: fix CVE-2021-46143
In reply to Steve SakomanIn doProlog in xmlparse.c in Expat (aka libexpat) before 2.4.3, an integer overflow exists for m_groupSize.
Backport patch from:
https://github.com/libexpat/libexpat/pull/538/commits/85ae9a2d7d0e9358f356b33977b842df8ebaec2b
CVE: CVE-2021-46143
--- .../expat/expat/CVE-2021-46143.patch | 43 +++++++++++++++++++ meta/recipes-core/expat/expat_2.2.9.bb | 1 + 2 files changed, 44 insertions(+) create mode 100644 meta/recipes-core/expat/expat/CVE-2021-46143.patch
meta/recipes-core/expat/expat/CVE-2021-46143.patch new file +43 -0
@@ -0,0 +1,43 @@ +From 85ae9a2d7d0e9358f356b33977b842df8ebaec2b Mon Sep 17 00:00:00 2001 +From: Sebastian Pipping <[email protected]> +Date: Sat, 25 Dec 2021 20:52:08 +0100 +Subject: [PATCH] lib: Prevent integer overflow on m_groupSize in function + doProlog (CVE-2021-46143) + +--- + expat/lib/xmlparse.c | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/expat/lib/xmlparse.c b/expat/lib/xmlparse.c +index b47c31b0..8f243126 100644 +--- a/lib/xmlparse.c ++++ b/lib/xmlparse.c +@@ -5046,6 +5046,11 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, + if (parser->m_prologState.level >= parser->m_groupSize) { + if (parser->m_groupSize) { + { ++ /* Detect and prevent integer overflow */ ++ if (parser->m_groupSize > (unsigned int)(-1) / 2u) { ++ return XML_ERROR_NO_MEMORY; ++ } ++ + char *const new_connector = (char *)REALLOC( + parser, parser->m_groupConnector, parser->m_groupSize *= 2); + if (new_connector == NULL) { +@@ -5056,6 +5061,16 @@ doProlog(XML_Parser parser, const ENCODING *enc, const char *s, const char *end, + } + + if (dtd->scaffIndex) { ++ /* Detect and prevent integer overflow. ++ * The preprocessor guard addresses the "always false" warning ++ * from -Wtype-limits on platforms where ++ * sizeof(unsigned int) < sizeof(size_t), e.g. on x86_64. */ ++#if UINT_MAX >= SIZE_MAX ++ if (parser->m_groupSize > (size_t)(-1) / sizeof(int)) { ++ return XML_ERROR_NO_MEMORY; ++ } ++#endif ++ + int *const new_scaff_index = (int *)REALLOC( + parser, dtd->scaffIndex, parser->m_groupSize * sizeof(int)); + if (new_scaff_index == NULL)
meta/recipes-core/expat/expat_2.2.9.bb +1 -0
@@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5b8620d98e49772d95fc1d291c26aa79" SRC_URI = "git://github.com/libexpat/libexpat.git;protocol=https;branch=master \ file://CVE-2013-0340.patch \ file://CVE-2021-45960.patch \ + file://CVE-2021-46143.patch \ file://CVE-2022-22822-27.patch \ file://libtool-tag.patch \ "
Signature · 1 line
2.25.1
PATCH 4/11 speex: fix CVE-2020-23903
In reply to Steve SakomanFrom: Kai Kang <[email protected]>
Backport patch to fix CVE-2020-23903.
CVE: CVE-2020-23903
--- .../speex/speex/CVE-2020-23903.patch | 30 +++++++++++++++++++ meta/recipes-multimedia/speex/speex_1.2.0.bb | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-multimedia/speex/speex/CVE-2020-23903.patch
meta/recipes-multimedia/speex/speex/CVE-2020-23903.patch new file +30 -0
@@ -0,0 +1,30 @@ +Backport patch to fix CVE-2020-23903. + +CVE: CVE-2020-23903 +Upstream-Status: Backport [https://github.com/xiph/speex/commit/870ff84] + +Signed-off-by: Kai Kang <[email protected]> + +From 870ff845b32f314aec0036641ffe18aba4916887 Mon Sep 17 00:00:00 2001 +From: Tristan Matthews <[email protected]> +Date: Mon, 13 Jul 2020 23:25:03 -0400 +Subject: [PATCH] wav_io: guard against invalid channel numbers + +Fixes #13 +--- + src/wav_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/wav_io.c b/src/wav_io.c +index b5183015..09d62eb0 100644 +--- a/src/wav_io.c ++++ b/src/wav_io.c +@@ -111,7 +111,7 @@ int read_wav_header(FILE *file, int *rate, int *channels, int *format, spx_int32 + stmp = le_short(stmp); + *channels = stmp; + +- if (stmp>2) ++ if (stmp>2 || stmp<1) + { + fprintf (stderr, "Only mono and (intensity) stereo supported\n"); + return -1;
meta/recipes-multimedia/speex/speex_1.2.0.bb +3 -1
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=314649d8ba9dd7045dfb6683f298d0a8 \ file://include/speex/speex.h;beginline=1;endline=34;md5=ef8c8ea4f7198d71cf3509c6ed05ea50" DEPENDS = "libogg speexdsp" -SRC_URI = "http://downloads.xiph.org/releases/speex/speex-${PV}.tar.gz" +SRC_URI = "http://downloads.xiph.org/releases/speex/speex-${PV}.tar.gz \ + file://CVE-2020-23903.patch \ + " UPSTREAM_CHECK_REGEX = "speex-(?P<pver>\d+(\.\d+)+)\.tar" SRC_URI[md5sum] = "8ab7bb2589110dfaf0ed7fa7757dc49c"
Signature · 1 line
2.25.1
PATCH 5/11 linux-yocto/5.4: update to v5.4.169
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits:
4ca2eaf1d477 Linux 5.4.16948c76fc53582 phonet/pep: refuse to enable an unbound pipea5c6a13e9056 hamradio: improve the incomplete fix to avoid NPDef5f7bfa19e3 hamradio: defer ax25 kfree after unregister_netdevdf8f79bcc2e4 ax25: NPD bug when detaching AX25 device0333eaf38500 hwmon: (lm90) Do not report 'busy' status bit as alarmbf260ff4a42f hwmom: (lm90) Fix citical alarm status for MAX6680/MAX6681 f373298e1bf0 pinctrl: mediatek: fix global-out-of-bounds issuebf04afb6137f mm: mempolicy: fix THP allocations escaping mempolicy restrictions f5db6bc93494 KVM: VMX: Fix stale docs for kvm-intel.emulate_invalid_guest_state 06c13e039d92 usb: gadget: u_ether: fix race in setting MAC address in setup phase b0406b5ef4e2 f2fs: fix to do sanity check on last xattr entry in __f2fs_setxattr() 806142c805ca tee: optee: Fix incorrect page free bug5478b90270a3 ARM: 9169/1: entry: fix Thumb2 bug in iWMMXt exception handling 1c3d4122bec6 mmc: core: Disable card detect during shutdowne9db8fc6c7af mmc: sdhci-tegra: Fix switch to HS400ES moded9031ce0b071 pinctrl: stm32: consider the GPIO offset to expose all the GPIO lines c7b2e5850ba6 x86/pkey: Fix undefined behaviour with PKRU_WD_BITddc1d49e10a7 parisc: Correct completer in lws start8467c8cb94a4 ipmi: fix initialization when workqueue allocation fails 8efd6a3391f7 ipmi: ssif: initialize ssif_info->client earlycd24bafefc17 ipmi: bail out if init_srcu_struct fails5525d80dc9dd Input: atmel_mxt_ts - fix double free in mxt_read_info_block 737a98d91b07 ALSA: hda/realtek: Amp init fixup for HP ZBook 15 G68df036befbc3 ALSA: drivers: opl3: Fix incorrect use of vp->statefdaf41977d77 ALSA: jack: Check the return value of kstrdup()44c743f63dd3 hwmon: (lm90) Drop critical attribute support for MAX6654 4615c9740575 hwmon: (lm90) Introduce flag indicating extended temperature support c2242478f28d hwmon: (lm90) Add basic support for TI TMP461d939660eff62 hwmon: (lm90) Add max6654 support to lm90 driver055ca98d48ba hwmon: (lm90) Fix usage of CONFIG2 register in detect function a7f95328c6f0 Input: elantech - fix stack out of bound access in elantech_change_report_id() e12dcd4aa7f4 sfc: falcon: Check null pointer of rx_queue->page_ringc11a41e26985 drivers: net: smc911x: Check for error irq5d556b1437e1 fjes: Check for error irqd7024080db82 bonding: fix ad_actor_system option setting to default992649b8b168 ipmi: Fix UAF when uninstall ipmi_si and ipmi_msghandler module 2460d96c19a8 net: skip virtio_net_hdr_set_proto if protocol already set 621d5536b452 net: accept UFOv6 packages in virtio_net_hdr_to_skb0b01c51c4f47 qlcnic: potential dereference null pointer of rx_queue->page_ring 685fc8d22489 netfilter: fix regression in looped (broad|multi)cast's MAC handling 79dcbd817615 IB/qib: Fix memory leak in qib_user_sdma_queue_pkts()78874bca4f27 spi: change clk_disable_unprepare to clk_unprepare0c0ac2547c87 arm64: dts: allwinner: orangepi-zero-plus: fix PHY mode6fa4e2992717 HID: holtek: fix mouse probing2712816c10b3 serial: 8250_fintek: Fix garbled text for console51c925a9bccc net: usb: lan78xx: add Allied Telesis AT29M2-AF8f843cf57202 Linux 5.4.1680d99b3c6bd39 xen/netback: don't queue unlimited number of packages8bfcd0385211 xen/netback: fix rx queue stall detection560e64413b4a xen/console: harden hvc_xen against event channel storms 3e68d099f09c xen/netfront: harden netfront against event channel storms 4ed9f5c511ce xen/blkfront: harden blkfront against event channel storms 192fe5739571 Revert "xsk: Do not sleep in poll() when need_wakeup set" e281b7199236 net: sched: Fix suspicious RCU usage while accessing tcf_tunnel_info 96a1550a2b43 mac80211: fix regression in SSN handling of addba tx66aba15a144a rcu: Mark accesses to rcu_state.n_force_qsb847ecff8507 scsi: scsi_debug: Sanity check block descriptor length in resp_mode_select() f9f300a92297 ovl: fix warning in ovl_create_real()ba2a9d8f8ef1 fuse: annotate lock in fuse_reverse_inval_entry()96f182c9f48b media: mxl111sf: change mutex_init() location095ad3969b62 xsk: Do not sleep in poll() when need_wakeup set29e9fdf7b681 ARM: dts: imx6ull-pinfunc: Fix CSI_DATA07__ESAI_TX0 pad name f6e9e7be9b80 Input: touchscreen - avoid bitwise vs logical OR warning 3d45573dfb6e mwifiex: Remove unnecessary braces from HostCmd_SET_SEQ_NO_BSS_INFO a19cf6844b50 mac80211: validate extended element ID is presente070c0c990d7 drm/amdgpu: correct register access for RLC_JUMP_TABLE_RESTORE c9ee8144e409 libata: if T_LENGTH is zero, dma direction should be DMA_NONE 62889094939c timekeeping: Really make sure wall_to_monotonic isn't positive 241d36219aaa USB: serial: option: add Telit FN990 compositionsd2bb4378e2bb USB: serial: cp210x: fix CP2105 GPIO registrationbae7f0808202 usb: xhci: Extend support for runtime power management for AMD's Yellow carp. 3dc6b5f2a4d5 PCI/MSI: Mask MSI-X vectors only on successc520e7cf82ac PCI/MSI: Clear PCI_MSIX_FLAGS_MASKALL on errored31692a9758 USB: NO_LPM quirk Lenovo USB-C to Ethernet Adapher(RTL8153-04) aae3448b78d9 USB: gadget: bRequestType is a bitfield, not a enumad0ed314d616 sit: do not call ipip6_dev_free() from sit_init_net()c675256a7f13 net: systemport: Add global locking for descriptor lifecycle 2bf888fa4a5c net/smc: Prevent smc_release() from long blocking56a6ffea18c2 net: Fix double 0x prefix print in SKB dump027a13973dad net/packet: rx_owner_map depends on pg_vec699e794c12a3 netdevsim: Zero-initialize memory for new map's value in function nsim_bpf_map_alloc a97e7dd4b713 ixgbe: set X550 MDIO speed before talking to PHY8addba6cab94 igbvf: fix double free in igbvf_probe36844e250a2e igb: Fix removal of unicast MAC filters of VFsbca4a53ea72c soc/tegra: fuse: Fix bitwise vs. logical OR warning166f0adf7e75 rds: memory leak in __rds_conn_create()9cb405ee5334 flow_offload: return EOPNOTSUPP for the unsupported mpls action type 066a637d1ce7 net: sched: lock action when translating it to flow_action infra e7660f9535ad mac80211: fix lookup when adding AddBA extension element f363af7c7045 mac80211: accept aggregation sessions on 6 GHz1e6526148149 mac80211: agg-tx: don't schedule_and_wake_txq() under sta->lock ceb30f48d817 mac80211: agg-tx: refactor sending addbaeeaf9c0609e0 selftest/net/forwarding: declare NETIFS p9 p102252220d9ebb dmaengine: st_fdma: fix MODULE_ALIAS18203fe17643 selftests: Fix IPv6 address bind testsb46f0afa74e7 selftests: Fix raw socket bind tests with VRF7b5596e53125 inet_diag: fix kernel-infoleak for UDP sockets2c589cf07bd5 inet_diag: use jiffies_delta_to_msecs()0d80462fbdca sch_cake: do not call cake_destroy() from cake_init()2fba53ccfb1b s390/kexec_file: fix error handling when applying relocations b380bf012d2b selftests: net: Correct ping6 expected rc from 2 to 1ec5c00be7836 clk: Don't parent clks until the parent is fully registered f83ed203c822 ARM: socfpga: dts: fix qspi node compatible46b9e29db201 mac80211: track only QoS data frames for admission control a6f18191c6c1 arm64: dts: rockchip: fix audio-supply for Rock Pi 486f2789e3c15 arm64: dts: rockchip: fix rk3399-leez-p710 vcc3v3-lan supply 4bb01424330d arm64: dts: rockchip: remove mmc-hs400-enhanced-strobe from rk3399-khadas-edge e0759696de68 nfsd: fix use-after-free due to delegation race7243aa71509a iio: adc: stm32: fix a current leak by resetting pcsel before disabling vdda 0d3277eabd54 audit: improve robustness of the audit queue handling501ecd90efdc dm btree remove: fix use after free in rebalance_children() b25e213522f6 recordmcount.pl: look for jgnop instruction as well as bcrl on s390 c0954f1010ad virtio_ring: Fix querying of maximum DMA mapping size for virtio device 802a1a850156 firmware: arm_scpi: Fix string overflow in SCPI genpd driver 33f0dfab3187 mac80211: send ADDBA requests using the tid/queue of the aggregation session 873e664a83ef mac80211: mark TX-during-stop for TX in in_reconfigff3e3fdc737a KVM: selftests: Make sure kvm_create_max_vcpus test won't hit RLIMIT_NOFILE
--- .../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(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +3 -3
@@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "2bddc20729f986e46ba5b802fa6ce8716ee34506" -SRCREV_meta ?= "ff304dbaec03398dc510602800b19d28b7c82927" +SRCREV_machine ?= "66f69e8b3cc56e22c8b78f3141fd736fc1c5859b" +SRCREV_meta ?= "dcbd44e70b6bc80a04cc92b625b1a3eaa2f78fc0" 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.167" +LINUX_VERSION ?= "5.4.169" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +4 -4
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.167" +LINUX_VERSION ?= "5.4.169" 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 ?= "e8825a1df3d08af26acf8fc2ddb140c40aa233f4" -SRCREV_machine ?= "b9dbced11f660908cec12d5e1339bbff0ac28d59" -SRCREV_meta ?= "ff304dbaec03398dc510602800b19d28b7c82927" +SRCREV_machine_qemuarm ?= "092520553603d101c48aafd95aac45f5f455882a" +SRCREV_machine ?= "d44538a3be2f25dc1c768d0ed31d18af18cc2aee" +SRCREV_meta ?= "dcbd44e70b6bc80a04cc92b625b1a3eaa2f78fc0" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.4.bb +11 -11
@@ -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 ?= "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" +SRCREV_machine_qemuarm ?= "69471f4c5c895fe6ccef696800c7ef2bda3ad2fd" +SRCREV_machine_qemuarm64 ?= "e0b9164ac4b0d53e7bd42bf1d2322eb5ce462d68" +SRCREV_machine_qemumips ?= "7bf5ddb8e9ae1284cb4e02bed7f9429bec0b39c4" +SRCREV_machine_qemuppc ?= "b0054e5e7451561a7c6a6d6a401395fbd0395801" +SRCREV_machine_qemuriscv64 ?= "01fe83c50f9aeb4da7c7c7d63a6c7afea83216ef" +SRCREV_machine_qemux86 ?= "01fe83c50f9aeb4da7c7c7d63a6c7afea83216ef" +SRCREV_machine_qemux86-64 ?= "01fe83c50f9aeb4da7c7c7d63a6c7afea83216ef" +SRCREV_machine_qemumips64 ?= "e8483ea124a1715790eba584ee2ad8aac1e15edf" +SRCREV_machine ?= "01fe83c50f9aeb4da7c7c7d63a6c7afea83216ef" +SRCREV_meta ?= "dcbd44e70b6bc80a04cc92b625b1a3eaa2f78fc0" # 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.167" +LINUX_VERSION ?= "5.4.169" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.25.1
PATCH 6/11 linux-yocto/5.4: update to v5.4.170
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits:
047dedaa38ce Linux 5.4.1702c3920c58e03 perf script: Fix CPU filtering of a script's switch events fe5838c22b98 net: fix use-after-free in tw_timer_handler46556c4ecd63 Input: spaceball - fix parsing of movement data packets 975774ea7528 Input: appletouch - initialize work before device registration 436f6d0005d6 scsi: vmw_pvscsi: Set residual data length conditionally 103b16a8c51f binder: fix async_free_space accounting for empty parcels 98cde4dd5ec8 usb: mtu3: set interval of FS intr and isoc endpoint 585e2b244dda usb: mtu3: fix list_head check warning50434eb6098f usb: mtu3: add memory barrier before set GPD's HWO 240fc586e83d usb: gadget: f_fs: Clear ffs_eventfd in ffs_data_clear. 20d80640fa61 xhci: Fresco FL1100 controller should not have BROKEN_MSI quirk set. b364fcef9615 uapi: fix linux/nfc.h userspace compilation errors 245c5e43cd25 nfc: uapi: use kernel size_t to fix user-space builds 9e4a3f47eff4 i2c: validate user data in compat ioctla7d3a1c6d9d9 fsl/fman: Fix missing put_device() call in fman_port_probe 2dc95e936414 net/ncsi: check for error return from call to nla_put_u32 ef01d63140f5 selftests/net: udpgso_bench_tx: fix dst ip argument 20f6896787c5 net/mlx5e: Fix wrong features assignment in case of error b85f87d30dba ionic: Initialize the 'lif->dbid_inuse' bitmap 1cd4063dbc91 NFC: st21nfca: Fix memory leak in device probe and remove 44cd64aa1c43 net: lantiq_xrx200: fix statistics of received bytes 3477f4b67ee4 net: usb: pegasus: Do not drop long Ethernet frames 831de271452b sctp: use call_rcu to free endpoint3218d6bd6195 selftests: Calculate udpgso segment count without header adjustment 0a2e9f6a8f33 udp: using datalen to cap ipv6 udp max gso segments db484d35a948 net/mlx5: DR, Fix NULL vs IS_ERR checking in dr_domain_init_resources cc926b8f4d39 scsi: lpfc: Terminate string in lpfc_debugfs_nvmeio_trc_write() 44937652afdb selinux: initialize proto variable in selinux_ip_postroute_compat() b536e357e73c recordmcount.pl: fix typo in s390 mcount regex 8d86b486e0de memblock: fix memblock_phys_alloc() section mismatch error 4606bfdaeb16 platform/x86: apple-gmux: use resource_size() with res 930d4986a432 tomoyo: Check exceeded quota early in tomoyo_domain_quota_is_ok(). 7978ddae240b Input: i8042 - enable deferred probe quirk for ASUS UM325UA f93d5dca7d84 Input: i8042 - add deferred probe support940e68e57ab6 tee: handle lookup of shm with reference count 0 4b38b12092b4 HID: asus: Add depends on USB_HID to HID_ASUS Kconfig option
--- .../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(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +3 -3
@@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "66f69e8b3cc56e22c8b78f3141fd736fc1c5859b" -SRCREV_meta ?= "dcbd44e70b6bc80a04cc92b625b1a3eaa2f78fc0" +SRCREV_machine ?= "693f365a839705814228d4d7a9fb362285af3542" +SRCREV_meta ?= "3ff7377107711b2670620aac2be36b3edefe7f37" 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.169" +LINUX_VERSION ?= "5.4.170" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +4 -4
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.169" +LINUX_VERSION ?= "5.4.170" 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 ?= "092520553603d101c48aafd95aac45f5f455882a" -SRCREV_machine ?= "d44538a3be2f25dc1c768d0ed31d18af18cc2aee" -SRCREV_meta ?= "dcbd44e70b6bc80a04cc92b625b1a3eaa2f78fc0" +SRCREV_machine_qemuarm ?= "f0f037abc011fc633c51f9557471babb368668f3" +SRCREV_machine ?= "0c76d34c0744a8f3d8b4a41860fc9f12624b082a" +SRCREV_meta ?= "3ff7377107711b2670620aac2be36b3edefe7f37" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.4.bb +11 -11
@@ -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 ?= "69471f4c5c895fe6ccef696800c7ef2bda3ad2fd" -SRCREV_machine_qemuarm64 ?= "e0b9164ac4b0d53e7bd42bf1d2322eb5ce462d68" -SRCREV_machine_qemumips ?= "7bf5ddb8e9ae1284cb4e02bed7f9429bec0b39c4" -SRCREV_machine_qemuppc ?= "b0054e5e7451561a7c6a6d6a401395fbd0395801" -SRCREV_machine_qemuriscv64 ?= "01fe83c50f9aeb4da7c7c7d63a6c7afea83216ef" -SRCREV_machine_qemux86 ?= "01fe83c50f9aeb4da7c7c7d63a6c7afea83216ef" -SRCREV_machine_qemux86-64 ?= "01fe83c50f9aeb4da7c7c7d63a6c7afea83216ef" -SRCREV_machine_qemumips64 ?= "e8483ea124a1715790eba584ee2ad8aac1e15edf" -SRCREV_machine ?= "01fe83c50f9aeb4da7c7c7d63a6c7afea83216ef" -SRCREV_meta ?= "dcbd44e70b6bc80a04cc92b625b1a3eaa2f78fc0" +SRCREV_machine_qemuarm ?= "2ee0677973f1c676d52c6864c0a227b8d0a91a3d" +SRCREV_machine_qemuarm64 ?= "205b919a1a53a5c46ff432cfc7292cbf688f34ce" +SRCREV_machine_qemumips ?= "ff59072d3f2b8189e65f1006357d003ef68ec03b" +SRCREV_machine_qemuppc ?= "bd68bc38761902dea6a823853f6044f6688751ca" +SRCREV_machine_qemuriscv64 ?= "d4f5a7cecc479dcfff63bd7e92507521956fb8b8" +SRCREV_machine_qemux86 ?= "d4f5a7cecc479dcfff63bd7e92507521956fb8b8" +SRCREV_machine_qemux86-64 ?= "d4f5a7cecc479dcfff63bd7e92507521956fb8b8" +SRCREV_machine_qemumips64 ?= "8aa05337ebd7798187b81f2561de15f2074a5eca" +SRCREV_machine ?= "d4f5a7cecc479dcfff63bd7e92507521956fb8b8" +SRCREV_meta ?= "3ff7377107711b2670620aac2be36b3edefe7f37" # 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.169" +LINUX_VERSION ?= "5.4.170" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.25.1
PATCH 7/11 linux-yocto/5.4: update to v5.4.171
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits:
0a4ce4977bbe Linux 5.4.171
0101f118529d mISDN: change function names to avoid conflicts
34821931e18e atlantic: Fix buff_ring OOB in aq_ring_rx_clean
44065cc11797 net: udp: fix alignment problem in udp4_seq_show()
0ad45baead37 ip6_vti: initialize __ip6_tnl_parm struct in vti6_siocdevprivate 8b36aa5af4da scsi: libiscsi: Fix UAF in iscsi_conn_get_param()/iscsi_conn_teardown() 6a3ffcc9ffd0 usb: mtu3: fix interval value for intr and isoc
f0e57098243c ipv6: Do cleanup if attribute validation fails in multipath route c94999cfbbbe ipv6: Continue processing multipath route even if gateway attribute is invalid 2a6a811a45fd phonet: refcount leak in pep_sock_accep
db0c834abbc1 rndis_host: support Hytera digital radios
72eb522ae6f1 power: reset: ltc2952: Fix use of floating point literals 159eaafee69b power: supply: core: Break capacity loop
102af6edfd3a xfs: map unwritten blocks in XFS_IOC_{ALLOC,FREE}SP just like fallocate 10f2c336929d net: phy: micrel: set soft_reset callback to genphy_soft_reset for KSZ8081 c0db2e1e60c6 sch_qfq: prevent shift-out-of-bounds in qfq_init_qdisc bcbfc7780047 batman-adv: mcast: don't send link-local multicast to mcast routers 76936ddb4913 lwtunnel: Validate RTA_ENCAP_TYPE attribute length
2ebd777513d9 ipv6: Check attribute length for RTA_GATEWAY when deleting multipath route a02d2be7eb48 ipv6: Check attribute length for RTA_GATEWAY in multipath route 34224e936a9d ipv4: Check attribute length for RTA_FLOW in multipath route 125d91f07233 ipv4: Check attribute length for RTA_GATEWAY in multipath route 1f46721836ee i40e: Fix incorrect netdev's real number of RX/TX queues f98acd3b4dcf i40e: Fix for displaying message regarding NVM version c340d45148c4 i40e: fix use-after-free in i40e_sync_filters_subtask() 38fbb1561d66 mac80211: initialize variable have_higher_than_11mbit 7646a340b25b RDMA/uverbs: Check for null return of kmalloc_array 5eb5d9c6591d RDMA/core: Don't infoleak GRH fields
415fc3f59595 iavf: Fix limit of total number of queues to active queues of VF 23ebe9cfda5e ieee802154: atusb: fix uninit value in atusb_set_extended_addr aa171d748a36 tracing: Tag trace_percpu_buffer as a percpu pointer db50ad6eec87 tracing: Fix check for trace_percpu_buffer validity in get_trace_buf() cbbed1338d76 selftests: x86: fix [-Wstringop-overread] warn in test_process_vm_readv() 6904679c8400 Input: touchscreen - Fix backport of a02dcde595f7cbd240ccd64de96034ad91cffc40 6e80d2ee44c6 f2fs: quota: fix potential deadlock
--- .../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(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +3 -3
@@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "693f365a839705814228d4d7a9fb362285af3542" -SRCREV_meta ?= "3ff7377107711b2670620aac2be36b3edefe7f37" +SRCREV_machine ?= "2e96217d85f653d79f1e691c84aaf178931550a7" +SRCREV_meta ?= "17ac54a7a0b472a035fea8aacd1f31c1fa322ff0" 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.170" +LINUX_VERSION ?= "5.4.171" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +4 -4
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.170" +LINUX_VERSION ?= "5.4.171" 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 ?= "f0f037abc011fc633c51f9557471babb368668f3" -SRCREV_machine ?= "0c76d34c0744a8f3d8b4a41860fc9f12624b082a" -SRCREV_meta ?= "3ff7377107711b2670620aac2be36b3edefe7f37" +SRCREV_machine_qemuarm ?= "59c50d08a8c111c9941b53cc3903cafc7b9339f0" +SRCREV_machine ?= "da1b138e527f276887038d0091980ec5bfbd0824" +SRCREV_meta ?= "17ac54a7a0b472a035fea8aacd1f31c1fa322ff0" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.4.bb +11 -11
@@ -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 ?= "2ee0677973f1c676d52c6864c0a227b8d0a91a3d" -SRCREV_machine_qemuarm64 ?= "205b919a1a53a5c46ff432cfc7292cbf688f34ce" -SRCREV_machine_qemumips ?= "ff59072d3f2b8189e65f1006357d003ef68ec03b" -SRCREV_machine_qemuppc ?= "bd68bc38761902dea6a823853f6044f6688751ca" -SRCREV_machine_qemuriscv64 ?= "d4f5a7cecc479dcfff63bd7e92507521956fb8b8" -SRCREV_machine_qemux86 ?= "d4f5a7cecc479dcfff63bd7e92507521956fb8b8" -SRCREV_machine_qemux86-64 ?= "d4f5a7cecc479dcfff63bd7e92507521956fb8b8" -SRCREV_machine_qemumips64 ?= "8aa05337ebd7798187b81f2561de15f2074a5eca" -SRCREV_machine ?= "d4f5a7cecc479dcfff63bd7e92507521956fb8b8" -SRCREV_meta ?= "3ff7377107711b2670620aac2be36b3edefe7f37" +SRCREV_machine_qemuarm ?= "c961afa9250955e8bc4e286fba5942181cdfce45" +SRCREV_machine_qemuarm64 ?= "0408baf57ccb7975ea0291418f44c1bf241b9792" +SRCREV_machine_qemumips ?= "1e20719de0a733cf6c9f1f5467a16e8449dd1eb3" +SRCREV_machine_qemuppc ?= "40c08791a68abb946948e1aea7532dc156e9eaa5" +SRCREV_machine_qemuriscv64 ?= "3889c10487e465acf5a2ecf182be8a9adb8ce863" +SRCREV_machine_qemux86 ?= "3889c10487e465acf5a2ecf182be8a9adb8ce863" +SRCREV_machine_qemux86-64 ?= "3889c10487e465acf5a2ecf182be8a9adb8ce863" +SRCREV_machine_qemumips64 ?= "31c53aae874ab1a677be38ffe29dc0e7084a08f4" +SRCREV_machine ?= "3889c10487e465acf5a2ecf182be8a9adb8ce863" +SRCREV_meta ?= "17ac54a7a0b472a035fea8aacd1f31c1fa322ff0" # 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.170" +LINUX_VERSION ?= "5.4.171" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.25.1
PATCH 8/11 linux-yocto/5.4: update to v5.4.172
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
Updating linux-yocto/5.4 to the latest korg -stable release that comprises the following commits:
b7f70762d158 Linux 5.4.172
f415409551b0 staging: greybus: fix stack size warning with UBSAN
65c2e7176f77 drm/i915: Avoid bitwise vs logical OR warning in snb_wm_latency_quirk() 86ded7a6cf40 staging: wlan-ng: Avoid bitwise vs logical OR warning in hfa384x_usb_throttlefn() a459686f986c media: Revert "media: uvcvideo: Set unique vdev name based in type" 7e07bedae159 random: fix crash on multiple early calls to add_bootloader_randomness() 517ab153f503 random: fix data race on crng init time
90ceecdaa062 random: fix data race on crng_node_pool
a4fa4377c91b can: gs_usb: gs_can_start_xmit(): zero-initialize hf->{flags,reserved} e90a7524b5c8 can: gs_usb: fix use of uninitialized variable, detach device on reception of invalid USB data 9e9241d3345a drivers core: Use sysfs_emit and sysfs_emit_at for show(device *...) functions ada3805f1423 mfd: intel-lpss: Fix too early PM enablement in the ACPI ->probe() d08a0a88db88 veth: Do not record rx queue hint in veth_xmit
a6722b497401 mmc: sdhci-pci: Add PCI ID for Intel ADL
1199f0928488 USB: Fix "slab-out-of-bounds Write" bug in usb_hcd_poll_rh_status 43aac50196f3 USB: core: Fix bug in resuming hub's handling of wakeup requests ed5c2683b67b Bluetooth: bfusb: fix division by zero in send path
784e873af3dc Bluetooth: btusb: fix memory leak in btusb_mtk_submit_wmt_recv_urb() ad07b60837b2 workqueue: Fix unbind_workers() VS wq_worker_running() race
--- .../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(-)
meta/recipes-kernel/linux/linux-yocto-rt_5.4.bb +3 -3
@@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "2e96217d85f653d79f1e691c84aaf178931550a7" -SRCREV_meta ?= "17ac54a7a0b472a035fea8aacd1f31c1fa322ff0" +SRCREV_machine ?= "e92d76afe6d8592917c0e7b948912c085e661df2" +SRCREV_meta ?= "98cce1c95fcc9a26965cbc5f038fd71d53c387c8" 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.171" +LINUX_VERSION ?= "5.4.172" LIC_FILES_CHKSUM = "file://COPYING;md5=bbea815ee2795b2f4230826c0c6b8814"
meta/recipes-kernel/linux/linux-yocto-tiny_5.4.bb +4 -4
@@ -6,7 +6,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.4.171" +LINUX_VERSION ?= "5.4.172" 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 ?= "59c50d08a8c111c9941b53cc3903cafc7b9339f0" -SRCREV_machine ?= "da1b138e527f276887038d0091980ec5bfbd0824" -SRCREV_meta ?= "17ac54a7a0b472a035fea8aacd1f31c1fa322ff0" +SRCREV_machine_qemuarm ?= "10b4756eee78aa43ff9ed64da700ec6e8d97ff22" +SRCREV_machine ?= "6ab93fdc53b64e146e4f16363375c1beb37b82e4" +SRCREV_meta ?= "98cce1c95fcc9a26965cbc5f038fd71d53c387c8" PV = "${LINUX_VERSION}+git${SRCPV}"
meta/recipes-kernel/linux/linux-yocto_5.4.bb +11 -11
@@ -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 ?= "c961afa9250955e8bc4e286fba5942181cdfce45" -SRCREV_machine_qemuarm64 ?= "0408baf57ccb7975ea0291418f44c1bf241b9792" -SRCREV_machine_qemumips ?= "1e20719de0a733cf6c9f1f5467a16e8449dd1eb3" -SRCREV_machine_qemuppc ?= "40c08791a68abb946948e1aea7532dc156e9eaa5" -SRCREV_machine_qemuriscv64 ?= "3889c10487e465acf5a2ecf182be8a9adb8ce863" -SRCREV_machine_qemux86 ?= "3889c10487e465acf5a2ecf182be8a9adb8ce863" -SRCREV_machine_qemux86-64 ?= "3889c10487e465acf5a2ecf182be8a9adb8ce863" -SRCREV_machine_qemumips64 ?= "31c53aae874ab1a677be38ffe29dc0e7084a08f4" -SRCREV_machine ?= "3889c10487e465acf5a2ecf182be8a9adb8ce863" -SRCREV_meta ?= "17ac54a7a0b472a035fea8aacd1f31c1fa322ff0" +SRCREV_machine_qemuarm ?= "8de1da3dc354dedef2e435e694eec6d6e72c9822" +SRCREV_machine_qemuarm64 ?= "eed7c0a64f3a7a91a130bc2e507304dc8b446a31" +SRCREV_machine_qemumips ?= "996a9660e4fab70db5cecec9c831141cd03c3d36" +SRCREV_machine_qemuppc ?= "0197cf5754b1bd4eb035c342af9cc27e8c3339ca" +SRCREV_machine_qemuriscv64 ?= "c6b015510134942076c0e111e56357656acf3dd5" +SRCREV_machine_qemux86 ?= "c6b015510134942076c0e111e56357656acf3dd5" +SRCREV_machine_qemux86-64 ?= "c6b015510134942076c0e111e56357656acf3dd5" +SRCREV_machine_qemumips64 ?= "fe2769a7c268ed224ec70fd2aaab850e4eef70dc" +SRCREV_machine ?= "c6b015510134942076c0e111e56357656acf3dd5" +SRCREV_meta ?= "98cce1c95fcc9a26965cbc5f038fd71d53c387c8" # 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.171" +LINUX_VERSION ?= "5.4.172" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native"
Signature · 1 line
2.25.1
PATCH 9/11 kernel: introduce python3-dtschema-wrapper
In reply to Steve SakomanFrom: Bruce Ashfield <[email protected]>
The 5.16 kernel introduced mandatory schema checking on any dtb file built through the kernel.
That funcionality is provided via python3-dt-schema.
The dependencies to enable that functionality is not small, and may not always be desired (in particular on architectures that do not support dtbs, or in development cycles). It may also be useful for allowing a non-conformant dts to be compiled.
This commit introduces a set of wrapper scripts that when added as a depenency to the kernel, can pass both the validation testing and validation steps of a dts.
Backported from oe-core commit 2566563ad49d.
--- meta/conf/distro/include/maintainers.inc | 1 + .../python3-dtschema-wrapper/dt-doc-validate | 20 +++++++++++++++++++ .../dtc/python3-dtschema-wrapper/dt-mk-schema | 20 +++++++++++++++++++ .../dtc/python3-dtschema-wrapper/dt-validate | 20 +++++++++++++++++++ .../dtc/python3-dtschema-wrapper_2021.10.bb | 17 ++++++++++++++++ 5 files changed, 78 insertions(+) create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-doc-validate create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate create mode 100644 meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb
meta/conf/distro/include/maintainers.inc +1 -0
@@ -576,6 +576,7 @@ RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk <open.source@oleksandr-kravch RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-dbus = "Oleksandr Kravchuk <[email protected]>" RECIPE_MAINTAINER_pn-python3-docutils = "Oleksandr Kravchuk <[email protected]>" +RECIPE_MAINTAINER_pn-python3-dtschema-wrapper = "Bruce Ashfield <[email protected]>" RECIPE_MAINTAINER_pn-python3-pycryptodome = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER_pn-python3-pycryptodomex = "Joshua Watt <[email protected]>" RECIPE_MAINTAINER_pn-python3-extras = "Oleksandr Kravchuk <[email protected]>"
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-doc-validate new file +20 -0
@@ -0,0 +1,20 @@ +#!/bin/sh +# dt-doc-validate wrapper to allow kernel dt-validation to pass +# +# Copyright (C) 2021 Bruce Ashfield <[email protected]> +# License: MIT (see COPYING.MIT at the root of the repository for terms) + +for arg; do + case "$arg" in + --version) + echo "v2021.10" + ;; + esac +done + +# TBD: left for future consideration +# exec dt-doc-validate.real "$@" + +# we always succeed +exit 0 +
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-mk-schema new file +20 -0
@@ -0,0 +1,20 @@ +#!/bin/sh +# dt-mk-schema wrapper to allow kernel dt-validation to pass +# +# Copyright (C) 2021 Bruce Ashfield <[email protected]> +# License: MIT (see COPYING.MIT at the root of the repository for terms) + +for arg; do + case "$arg" in + --version) + echo "v2021.10" + ;; + esac +done + +# TBD: left for future consideration +# exec dt-mk-schema.real "$@" + +# we always succeed +exit 0 +
meta/recipes-kernel/dtc/python3-dtschema-wrapper/dt-validate new file +20 -0
@@ -0,0 +1,20 @@ +#!/bin/sh +# dt-validate wrapper to allow kernel dt-validation to pass +# +# Copyright (C) 2021 Bruce Ashfield <[email protected]> +# License: MIT (see COPYING.MIT at the root of the repository for terms) + +for arg; do + case "$arg" in + --version) + echo "v2021.10" + ;; + esac +done + +# TBD: left for future consideration +# exec dt-validate.real "$@" + +# we always succeed +exit 0 +
meta/recipes-kernel/dtc/python3-dtschema-wrapper_2021.10.bb new file +17 -0
@@ -0,0 +1,17 @@ +DESCRIPTION = "Wrapper for tooling for devicetree validation using YAML and jsonschema" +HOMEPAGE = "https://yoctoproject.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +SRC_URI = "file://dt-doc-validate \ + file://dt-mk-schema \ + file://dt-validate" + +do_install() { + install -d ${D}${bindir}/ + install -m 755 ${WORKDIR}/dt-doc-validate ${D}${bindir}/ + install -m 755 ${WORKDIR}/dt-mk-schema ${D}${bindir}/ + install -m 755 ${WORKDIR}/dt-validate ${D}${bindir}/ +} + +BBCLASSEXTEND = "native nativesdk"
Signature · 1 line
2.25.1
PATCH 10/11 lttng-tools: Add missing DEPENDS on bison-native
In reply to Steve SakomanFrom: Richard Purdie <[email protected]>
This was being provided by other pieces of the dependency chain but is specifically required by configure and could fail if those pieces come from sstate. Fix such builds by adding the missing dependency.
--- meta/recipes-kernel/lttng/lttng-tools_2.11.5.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-kernel/lttng/lttng-tools_2.11.5.bb +1 -1
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \ file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca" -DEPENDS = "liburcu popt libxml2 util-linux" +DEPENDS = "liburcu popt libxml2 util-linux bison-native" RDEPENDS_${PN} = "libgcc" RDEPENDS_${PN}-ptest += "make perl bash gawk babeltrace procps perl-module-overloading coreutils util-linux kmod lttng-modules sed python3-core" RDEPENDS_${PN}-ptest_append_libc-glibc = " glibc-utils"
Signature · 1 line
2.25.1
PATCH 11/11 Revert "weston: Use systemd notify,"
In reply to Steve SakomanFrom: Marek Vasut <[email protected]>
Commit 4efdcc1090 ("weston: Use systemd notify,") has non-trivial to backport dependencies without which it cannot work, revert backport.
In oe-core dunfell, weston is still started using /usr/bin/weston-start script in meta/recipes-graphics/wayland/weston-init/[email protected] . Since 76ed534267 ("weston-init: Use weston-launch when starting weston as the first windowing system"), the weston-start script starts weston using weston-launch executable in case $DISPLAY is not set, i.e. when weston is started as the primary compositor.
When weston is started via weston-launch, the notification to systemd is not delivered, and weston service fails to start with the following:
"
[email protected]: start operation timed out. Terminating. "
The weston systemd service has been reworked considerably since oe-core dunfell in commit c21fa5a291 ("weston-init: Redefine weston service and add socket activation option"), which replaced the use of weston-start in [email protected] with plain weston, and has been further improved in commit dd83fb40f7 ("weston-init: Stop running weston as root") . The commit reverted here, oe-core/master commit c8aa0222ce ("weston: wrapper for weston modules argument"), landed only with the two aforementioned reworks already in place, therefore the commit could have never been tested with weston started via weston-launch executable and the timeout at delivering systemd notification could not have happened in master.
Both c21fa5a291 ("weston-init: Redefine weston service and add socket activation option") and dd83fb40f7 ("weston-init: Stop running weston as root") are large feature patches and thus unsuitable for stable backports, hence this revert seems to be the least problematic way.
--- .../wayland/weston-init/weston-start | 12 ------------ .../wayland/weston-init/[email protected] | 6 ------ .../wayland/weston/systemd-notify.weston-start | 9 --------- .../wayland/weston/xwayland.weston-start | 3 ++- meta/recipes-graphics/wayland/weston_8.0.0.bb | 6 ------ 5 files changed, 2 insertions(+), 34 deletions(-) delete mode 100644 meta/recipes-graphics/wayland/weston/systemd-notify.weston-start
meta/recipes-graphics/wayland/weston-init/weston-start +0 -12
@@ -23,15 +23,6 @@ add_openvt_argument() { openvt_args="$openvt_args $1" } -## Add module to --modules argument -add_weston_module() { - if [ -z "${weston_modules}" ]; then - weston_modules="--modules " - fi; - weston_modules="${weston_modules}${1}," -} - - if [ -n "$WAYLAND_DISPLAY" ]; then echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." exit 1
@@ -74,9 +65,6 @@ if [ -d "$modules_dir" ]; then # process module . $m done - if [ -n "${weston_modules}" ]; then - add_weston_argument "${weston_modules} " - fi; fi if test -z "$XDG_RUNTIME_DIR"; then
meta/recipes-graphics/wayland/weston-init/[email protected] +0 -6
@@ -1,7 +1,3 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 - [Unit] Description=Weston Wayland Compositor RequiresMountsFor=/run
@@ -9,8 +5,6 @@ Conflicts=plymouth-quit.service After=systemd-user-sessions.service plymouth-quit-wait.service [Service] -Type=notify -NotifyAccess=all User=%i PAMName=login EnvironmentFile=-/etc/default/weston
meta/recipes-graphics/wayland/weston/systemd-notify.weston-start deleted +0 -9
@@ -1,9 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: Huawei Inc. -# SPDX-License-Identifier: Apache-2.0 - - -if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then - add_weston_module "systemd-notify.so" -fi
meta/recipes-graphics/wayland/weston/xwayland.weston-start +2 -1
@@ -2,5 +2,6 @@ if type Xwayland >/dev/null 2>/dev/null; then mkdir -p /tmp/.X11-unix - add_weston_module "xwayland.so" + + add_weston_argument "--modules=xwayland.so" fi
meta/recipes-graphics/wayland/weston_8.0.0.bb +0 -6
@@ -5,11 +5,9 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ file://libweston/compositor.c;endline=27;md5=6c53bbbd99273f4f7c4affa855c33c0a" - SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ - file://systemd-notify.weston-start \ file://xwayland.weston-start \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ file://0002-desktop-shell-Remove-no-op-de-activation-of-the-xdg-.patch \
@@ -106,10 +104,6 @@ do_install_append() { install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland fi - if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then - install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify - fi - if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then chmod u+s ${D}${bindir}/weston-launch fi
Signature · 1 line
2.25.1