diff options
| author | Bruce Ashfield <bruce.ashfield@gmail.com> | 2023-09-29 16:04:45 -0400 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-01 08:12:59 +0100 |
| commit | 0082d2be938889ea719676d9a9ac404196696a13 (patch) | |
| tree | 5481f6be84600fdaf02edf39b18684438b7bf803 | |
| parent | 4ff192f9ec3f565b164ef4c45829a492f630fd3f (diff) | |
| download | poky-0082d2be938889ea719676d9a9ac404196696a13.tar.gz | |
linux-yocto/6.4: update to v6.4.15
Updating to the latest korg -stable release that comprises
the following commits:
f60d5fd5e950 Linux 6.4.15
12ac1448ab77 pinctrl: amd: Don't show `Invalid config param` errors
120e477de917 usb: typec: tcpci: clear the fault status bit
46c11be2dca2 nilfs2: fix WARNING in mark_buffer_dirty due to discarded buffer reuse
d53a0a737639 dt-bindings: sc16is7xx: Add property to change GPIO function
f75a9a53327b tcpm: Avoid soft reset when partner does not support get_status
c95605d5ed23 fsi: master-ast-cf: Add MODULE_FIRMWARE macro
4c0dc67881c6 firmware: stratix10-svc: Fix an NULL vs IS_ERR() bug in probe
43b5cedc3564 serial: sc16is7xx: fix bug when first setting GPIO direction
e534d3e986fc serial: sc16is7xx: fix broken port 0 uart init
e02214399ef4 serial: qcom-geni: fix opp vote on shutdown
2f2b1f63a760 wifi: ath11k: Cleanup mac80211 references on failure during tx_complete
f6909803263c wifi: ath11k: Don't drop tx_status when peer cannot be found
c32e118debe9 wifi: rtw88: usb: kill and free rx urbs on probe failure
e74778e91fed wifi: mt76: mt7921: fix skb leak by txs missing in AMSDU
046378bdf9de wifi: mt76: mt7921: do not support one stream on secondary antenna only
18a9d16f2fbe staging: rtl8712: fix race condition
5db7c0f7fb51 HID: wacom: remove the battery when the EKR is off
ae3f94d539a3 usb: chipidea: imx: improve logic if samsung,picophy-* parameter is 0
ce06713e64e3 usb: dwc3: meson-g12a: do post init to fix broken usb after resumption
596b16ee3f9a ALSA: usb-audio: Fix init call orders for UAC1
c72b4c1c2407 USB: serial: option: add FOXCONN T99W368/T99W373 product
7114ed5e53b0 USB: serial: option: add Quectel EM05G variant (0x030e)
784a1fd76b74 modules: only allow symbol_get of EXPORT_SYMBOL_GPL modules
f2114d34d6bb rtc: ds1685: use EXPORT_SYMBOL_GPL for ds1685_rtc_poweroff
68a2c15de311 net: enetc: use EXPORT_SYMBOL_GPL for enetc_phc_index
95dca60f39a6 mmc: au1xmmc: force non-modular build and remove symbol_get usage
245bc3e5329e ARM: pxa: remove use of symbol_get()
1c660940f525 ksmbd: reduce descriptor size if remaining bytes is less than request size
1a13ecb96230 ksmbd: replace one-element array with flex-array member in struct smb2_ea_info
7f1d6cb0eb6a ksmbd: fix slub overflow in ksmbd_decode_ntlmssp_auth_blob()
a43bf41344d0 ksmbd: fix wrong DataOffset validation of create context
9535cd211933 erofs: ensure that the post-EOF tails are all zeroed
(From OE-Core rev: 9151757f43d00dd3092e61a6aca669335c8ecf63)
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-kernel/linux/cve-exclusion_6.4.inc | 18 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb | 6 | ||||
| -rw-r--r-- | meta/recipes-kernel/linux/linux-yocto_6.4.bb | 28 |
4 files changed, 35 insertions, 23 deletions
diff --git a/meta/recipes-kernel/linux/cve-exclusion_6.4.inc b/meta/recipes-kernel/linux/cve-exclusion_6.4.inc index d64ab0092d..7bffaa70e1 100644 --- a/meta/recipes-kernel/linux/cve-exclusion_6.4.inc +++ b/meta/recipes-kernel/linux/cve-exclusion_6.4.inc | |||
| @@ -1,9 +1,9 @@ | |||
| 1 | 1 | ||
| 2 | # Auto-generated CVE metadata, DO NOT EDIT BY HAND. | 2 | # Auto-generated CVE metadata, DO NOT EDIT BY HAND. |
| 3 | # Generated at 2023-09-19 16:30:35.921888+00:00 for version 6.4.14 | 3 | # Generated at 2023-09-30 07:22:32.115009+00:00 for version 6.4.15 |
| 4 | 4 | ||
| 5 | python check_kernel_cve_status_version() { | 5 | python check_kernel_cve_status_version() { |
| 6 | this_version = "6.4.14" | 6 | this_version = "6.4.15" |
| 7 | kernel_version = d.getVar("LINUX_VERSION") | 7 | kernel_version = d.getVar("LINUX_VERSION") |
| 8 | if kernel_version != this_version: | 8 | if kernel_version != this_version: |
| 9 | bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) | 9 | bb.warn("Kernel CVE status needs updating: generated for %s but kernel is %s" % (this_version, kernel_version)) |
| @@ -3450,6 +3450,8 @@ CVE_STATUS[CVE-2020-36691] = "fixed-version: Fixed from version 5.8rc1" | |||
| 3450 | 3450 | ||
| 3451 | CVE_STATUS[CVE-2020-36694] = "fixed-version: Fixed from version 5.10" | 3451 | CVE_STATUS[CVE-2020-36694] = "fixed-version: Fixed from version 5.10" |
| 3452 | 3452 | ||
| 3453 | CVE_STATUS[CVE-2020-36766] = "fixed-version: Fixed from version 5.9rc1" | ||
| 3454 | |||
| 3453 | CVE_STATUS[CVE-2020-3702] = "fixed-version: Fixed from version 5.12rc1" | 3455 | CVE_STATUS[CVE-2020-3702] = "fixed-version: Fixed from version 5.12rc1" |
| 3454 | 3456 | ||
| 3455 | CVE_STATUS[CVE-2020-4788] = "fixed-version: Fixed from version 5.10rc5" | 3457 | CVE_STATUS[CVE-2020-4788] = "fixed-version: Fixed from version 5.10rc5" |
| @@ -4644,7 +4646,7 @@ CVE_STATUS[CVE-2023-1192] = "fixed-version: Fixed from version 6.4rc1" | |||
| 4644 | 4646 | ||
| 4645 | # CVE-2023-1193 has no known resolution | 4647 | # CVE-2023-1193 has no known resolution |
| 4646 | 4648 | ||
| 4647 | # CVE-2023-1194 has no known resolution | 4649 | CVE_STATUS[CVE-2023-1194] = "fixed-version: Fixed from version 6.4rc6" |
| 4648 | 4650 | ||
| 4649 | CVE_STATUS[CVE-2023-1195] = "fixed-version: Fixed from version 6.1rc3" | 4651 | CVE_STATUS[CVE-2023-1195] = "fixed-version: Fixed from version 6.1rc3" |
| 4650 | 4652 | ||
| @@ -5034,6 +5036,12 @@ CVE_STATUS[CVE-2023-4244] = "cpe-stable-backport: Backported in 6.4.12" | |||
| 5034 | 5036 | ||
| 5035 | CVE_STATUS[CVE-2023-4273] = "cpe-stable-backport: Backported in 6.4.10" | 5037 | CVE_STATUS[CVE-2023-4273] = "cpe-stable-backport: Backported in 6.4.10" |
| 5036 | 5038 | ||
| 5039 | # CVE-2023-42752 needs backporting (fixed from 6.4.16) | ||
| 5040 | |||
| 5041 | # CVE-2023-42753 needs backporting (fixed from 6.4.16) | ||
| 5042 | |||
| 5043 | CVE_STATUS[CVE-2023-42755] = "fixed-version: Fixed from version 6.3rc1" | ||
| 5044 | |||
| 5037 | CVE_STATUS[CVE-2023-4385] = "fixed-version: Fixed from version 5.19rc1" | 5045 | CVE_STATUS[CVE-2023-4385] = "fixed-version: Fixed from version 5.19rc1" |
| 5038 | 5046 | ||
| 5039 | CVE_STATUS[CVE-2023-4387] = "fixed-version: Fixed from version 5.18" | 5047 | CVE_STATUS[CVE-2023-4387] = "fixed-version: Fixed from version 5.18" |
| @@ -5058,3 +5066,7 @@ CVE_STATUS[CVE-2023-4611] = "cpe-stable-backport: Backported in 6.4.8" | |||
| 5058 | 5066 | ||
| 5059 | # CVE-2023-4921 needs backporting (fixed from 6.6rc1) | 5067 | # CVE-2023-4921 needs backporting (fixed from 6.6rc1) |
| 5060 | 5068 | ||
| 5069 | # CVE-2023-5158 has no known resolution | ||
| 5070 | |||
| 5071 | # CVE-2023-5197 needs backporting (fixed from 6.6rc3) | ||
| 5072 | |||
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb index aacbea40c0..07e852d584 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_6.4.bb | |||
| @@ -14,13 +14,13 @@ python () { | |||
| 14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") | 14 | raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") |
| 15 | } | 15 | } |
| 16 | 16 | ||
| 17 | SRCREV_machine ?= "06b99074bdc85095a2b3411dcade4a64a8e8f7c0" | 17 | SRCREV_machine ?= "40f6eb23017e1bb31c63e980b6d11bc8e917824b" |
| 18 | SRCREV_meta ?= "f12230a4c8a427af642be8196828a23f4562bc86" | 18 | SRCREV_meta ?= "b1e8a40393e0ac784e05a45ee90b6680e3b53263" |
| 19 | 19 | ||
| 20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ | 20 | SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine;protocol=https \ |
| 21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https" | 21 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https" |
| 22 | 22 | ||
| 23 | LINUX_VERSION ?= "6.4.14" | 23 | LINUX_VERSION ?= "6.4.15" |
| 24 | 24 | ||
| 25 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 25 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
| 26 | 26 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb index c3a7a16342..74b830afb4 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_6.4.bb | |||
| @@ -8,7 +8,7 @@ require recipes-kernel/linux/linux-yocto.inc | |||
| 8 | # CVE exclusions | 8 | # CVE exclusions |
| 9 | include recipes-kernel/linux/cve-exclusion_6.4.inc | 9 | include recipes-kernel/linux/cve-exclusion_6.4.inc |
| 10 | 10 | ||
| 11 | LINUX_VERSION ?= "6.4.14" | 11 | LINUX_VERSION ?= "6.4.15" |
| 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
| 13 | 13 | ||
| 14 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" | 14 | DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" |
| @@ -17,8 +17,8 @@ DEPENDS += "openssl-native util-linux-native" | |||
| 17 | KMETA = "kernel-meta" | 17 | KMETA = "kernel-meta" |
| 18 | KCONF_BSP_AUDIT_LEVEL = "2" | 18 | KCONF_BSP_AUDIT_LEVEL = "2" |
| 19 | 19 | ||
| 20 | SRCREV_machine ?= "800df81fa2a8bacd6487a19115b3f89f34620249" | 20 | SRCREV_machine ?= "3f60b22a4257993a1e389d46d1204a0f580fc99e" |
| 21 | SRCREV_meta ?= "f12230a4c8a427af642be8196828a23f4562bc86" | 21 | SRCREV_meta ?= "b1e8a40393e0ac784e05a45ee90b6680e3b53263" |
| 22 | 22 | ||
| 23 | PV = "${LINUX_VERSION}+git" | 23 | PV = "${LINUX_VERSION}+git" |
| 24 | 24 | ||
diff --git a/meta/recipes-kernel/linux/linux-yocto_6.4.bb b/meta/recipes-kernel/linux/linux-yocto_6.4.bb index e959b2a88f..d17f05eba4 100644 --- a/meta/recipes-kernel/linux/linux-yocto_6.4.bb +++ b/meta/recipes-kernel/linux/linux-yocto_6.4.bb | |||
| @@ -18,25 +18,25 @@ KBRANCH:qemux86-64 ?= "v6.4/standard/base" | |||
| 18 | KBRANCH:qemuloongarch64 ?= "v6.4/standard/base" | 18 | KBRANCH:qemuloongarch64 ?= "v6.4/standard/base" |
| 19 | KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64" | 19 | KBRANCH:qemumips64 ?= "v6.4/standard/mti-malta64" |
| 20 | 20 | ||
| 21 | SRCREV_machine:qemuarm ?= "0194f88dc4ac51536f9bb2bf751d256bc5fe5d69" | 21 | SRCREV_machine:qemuarm ?= "47cff83414374714b911719ba588aa6e2816956b" |
| 22 | SRCREV_machine:qemuarm64 ?= "800df81fa2a8bacd6487a19115b3f89f34620249" | 22 | SRCREV_machine:qemuarm64 ?= "3f60b22a4257993a1e389d46d1204a0f580fc99e" |
| 23 | SRCREV_machine:qemuloongarch64 ?= "800df81fa2a8bacd6487a19115b3f89f34620249" | 23 | SRCREV_machine:qemuloongarch64 ?= "3f60b22a4257993a1e389d46d1204a0f580fc99e" |
| 24 | SRCREV_machine:qemumips ?= "179200623f949dde2afeca75943700a2cd0684ab" | 24 | SRCREV_machine:qemumips ?= "d3a6c87612629a4c1f722b7d93e9a04aec7b22a4" |
| 25 | SRCREV_machine:qemuppc ?= "800df81fa2a8bacd6487a19115b3f89f34620249" | 25 | SRCREV_machine:qemuppc ?= "3f60b22a4257993a1e389d46d1204a0f580fc99e" |
| 26 | SRCREV_machine:qemuriscv64 ?= "800df81fa2a8bacd6487a19115b3f89f34620249" | 26 | SRCREV_machine:qemuriscv64 ?= "3f60b22a4257993a1e389d46d1204a0f580fc99e" |
| 27 | SRCREV_machine:qemuriscv32 ?= "800df81fa2a8bacd6487a19115b3f89f34620249" | 27 | SRCREV_machine:qemuriscv32 ?= "3f60b22a4257993a1e389d46d1204a0f580fc99e" |
| 28 | SRCREV_machine:qemux86 ?= "800df81fa2a8bacd6487a19115b3f89f34620249" | 28 | SRCREV_machine:qemux86 ?= "3f60b22a4257993a1e389d46d1204a0f580fc99e" |
| 29 | SRCREV_machine:qemux86-64 ?= "800df81fa2a8bacd6487a19115b3f89f34620249" | 29 | SRCREV_machine:qemux86-64 ?= "3f60b22a4257993a1e389d46d1204a0f580fc99e" |
| 30 | SRCREV_machine:qemumips64 ?= "4ce1ab0a4fce437802b0f7305289b036ffb4ccae" | 30 | SRCREV_machine:qemumips64 ?= "da59fe1c279b1be0b6b51dc503fe6500fdf84671" |
| 31 | SRCREV_machine ?= "800df81fa2a8bacd6487a19115b3f89f34620249" | 31 | SRCREV_machine ?= "3f60b22a4257993a1e389d46d1204a0f580fc99e" |
| 32 | SRCREV_meta ?= "f12230a4c8a427af642be8196828a23f4562bc86" | 32 | SRCREV_meta ?= "b1e8a40393e0ac784e05a45ee90b6680e3b53263" |
| 33 | 33 | ||
| 34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll | 34 | # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll |
| 35 | # get the <version>/base branch, which is pure upstream -stable, and the same | 35 | # get the <version>/base branch, which is pure upstream -stable, and the same |
| 36 | # meta SRCREV as the linux-yocto-standard builds. Select your version using the | 36 | # meta SRCREV as the linux-yocto-standard builds. Select your version using the |
| 37 | # normal PREFERRED_VERSION settings. | 37 | # normal PREFERRED_VERSION settings. |
| 38 | BBCLASSEXTEND = "devupstream:target" | 38 | BBCLASSEXTEND = "devupstream:target" |
| 39 | SRCREV_machine:class-devupstream ?= "babc8be398c3a0701e52582f93bfba946e9e5f8e" | 39 | SRCREV_machine:class-devupstream ?= "f60d5fd5e950c89a38578ae6f25877de511bb031" |
| 40 | PN:class-devupstream = "linux-yocto-upstream" | 40 | PN:class-devupstream = "linux-yocto-upstream" |
| 41 | KBRANCH:class-devupstream = "v6.4/base" | 41 | KBRANCH:class-devupstream = "v6.4/base" |
| 42 | 42 | ||
| @@ -44,7 +44,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA | |||
| 44 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https" | 44 | git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.4;destsuffix=${KMETA};protocol=https" |
| 45 | 45 | ||
| 46 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" | 46 | LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" |
| 47 | LINUX_VERSION ?= "6.4.14" | 47 | LINUX_VERSION ?= "6.4.15" |
| 48 | 48 | ||
| 49 | PV = "${LINUX_VERSION}+git" | 49 | PV = "${LINUX_VERSION}+git" |
| 50 | 50 | ||
