diff -u linux-aws-6.5-6.5.0/debian.aws-6.5/changelog linux-aws-6.5-6.5.0/debian.aws-6.5/changelog --- linux-aws-6.5-6.5.0/debian.aws-6.5/changelog +++ linux-aws-6.5-6.5.0/debian.aws-6.5/changelog @@ -1,3 +1,38 @@ +linux-aws-6.5 (6.5.0-1018.18~22.04.1) jammy; urgency=medium + + * jammy/linux-aws-6.5: 6.5.0-1018.18~22.04.1 -proposed tracker (LP: #2059685) + + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + + [ Ubuntu: 6.5.0-1018.18 ] + + * mantic/linux-aws: 6.5.0-1018.18 -proposed tracker (LP: #2059686) + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + * mantic/linux: 6.5.0-28.29 -proposed tracker (LP: #2059706) + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + * Remove getabis scripts (LP: #2059143) + - [Packaging] Remove getabis + * CVE-2023-52600 + - jfs: fix uaf in jfs_evict_inode + * Mantic update: upstream stable patchset 2024-03-27 (LP: #2059284) // + CVE-2023-52603 + - UBSAN: array-index-out-of-bounds in dtSplitRoot + * CVE-2024-26581 + - netfilter: nft_set_rbtree: skip end interval element from gc + * Mantic update: upstream stable patchset 2024-03-07 (LP: #2056403) // + CVE-2024-26589 + - bpf: Reject variable offset alu on PTR_TO_FLOW_KEYS + * Mantic update: upstream stable patchset 2024-03-07 (LP: #2056403) // + CVE-2024-26591 + - bpf: Fix re-attachment branch in bpf_tracing_prog_attach + * iwlwifi disconnect and crash - intel wifi7 (LP: #2058808) + - wifi: iwlwifi: pcie: fix RB status reading + + -- Philip Cox Fri, 05 Apr 2024 09:24:14 -0400 + linux-aws-6.5 (6.5.0-1017.17~22.04.2) jammy; urgency=medium * Packaging resync (LP: #1786013) reverted: --- linux-aws-6.5-6.5.0/debian.aws-6.5/etc/getabis +++ linux-aws-6.5-6.5.0.orig/debian.aws-6.5/etc/getabis @@ -1,15 +0,0 @@ -repo_list=( - "http://archive.ubuntu.com/ubuntu/pool/main/l/linux-aws-6.5" - "http://ports.ubuntu.com/ubuntu-ports/pool/main/l/linux-aws-6.5" - "http://archive.ubuntu.com/ubuntu/pool/universe/l/linux-aws-6.5" - "http://ports.ubuntu.com/ubuntu-ports/pool/universe/l/linux-aws-6.5" - "http://ppa.launchpad.net/canonical-kernel-team/ppa/ubuntu/pool/main/l/linux-aws-6.5" - "http://ppa.launchpad.net/canonical-kernel-team/ppa2/ubuntu/pool/main/l/linux-aws-6.5" - "http://ppa.launchpad.net/canonical-kernel-team/unstable/ubuntu/pool/main/l/linux-aws-6.5" - "https://launchpad.net/~canonical-kernel-team/+archive/ubuntu/bootstrap/+files" -) - -package_prefixes linux-image linux-modules linux-modules-extra - -getall amd64 aws -getall arm64 aws diff -u linux-aws-6.5-6.5.0/debian.aws-6.5/reconstruct linux-aws-6.5-6.5.0/debian.aws-6.5/reconstruct --- linux-aws-6.5-6.5.0/debian.aws-6.5/reconstruct +++ linux-aws-6.5-6.5.0/debian.aws-6.5/reconstruct @@ -21,7 +21,6 @@ chmod +x 'debian/scripts/misc/fips-checks' chmod +x 'debian/scripts/misc/fw-to-ihex.sh' chmod +x 'debian/scripts/misc/gen-auto-reconstruct' -chmod +x 'debian/scripts/misc/getabis' chmod +x 'debian/scripts/misc/git-ubuntu-log' chmod +x 'debian/scripts/misc/insert-changes' chmod +x 'debian/scripts/misc/insert-mainline-changes' diff -u linux-aws-6.5-6.5.0/debian.aws-6.5/tracking-bug linux-aws-6.5-6.5.0/debian.aws-6.5/tracking-bug --- linux-aws-6.5-6.5.0/debian.aws-6.5/tracking-bug +++ linux-aws-6.5-6.5.0/debian.aws-6.5/tracking-bug @@ -1 +1 @@ -2055563 2024.03.04-1 +2059685 s2024.03.04-1 diff -u linux-aws-6.5-6.5.0/debian.aws/changelog linux-aws-6.5-6.5.0/debian.aws/changelog --- linux-aws-6.5-6.5.0/debian.aws/changelog +++ linux-aws-6.5-6.5.0/debian.aws/changelog @@ -1,3 +1,35 @@ +linux-aws (6.5.0-1018.18) mantic; urgency=medium + + * mantic/linux-aws: 6.5.0-1018.18 -proposed tracker (LP: #2059686) + + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + + [ Ubuntu: 6.5.0-28.29 ] + + * mantic/linux: 6.5.0-28.29 -proposed tracker (LP: #2059706) + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + * Remove getabis scripts (LP: #2059143) + - [Packaging] Remove getabis + * CVE-2023-52600 + - jfs: fix uaf in jfs_evict_inode + * Mantic update: upstream stable patchset 2024-03-27 (LP: #2059284) // + CVE-2023-52603 + - UBSAN: array-index-out-of-bounds in dtSplitRoot + * CVE-2024-26581 + - netfilter: nft_set_rbtree: skip end interval element from gc + * Mantic update: upstream stable patchset 2024-03-07 (LP: #2056403) // + CVE-2024-26589 + - bpf: Reject variable offset alu on PTR_TO_FLOW_KEYS + * Mantic update: upstream stable patchset 2024-03-07 (LP: #2056403) // + CVE-2024-26591 + - bpf: Fix re-attachment branch in bpf_tracing_prog_attach + * iwlwifi disconnect and crash - intel wifi7 (LP: #2058808) + - wifi: iwlwifi: pcie: fix RB status reading + + -- Philip Cox Thu, 04 Apr 2024 11:20:05 -0400 + linux-aws (6.5.0-1017.17) mantic; urgency=medium * mantic/linux-aws: 6.5.0-1017.17 -proposed tracker (LP: #2055564) reverted: --- linux-aws-6.5-6.5.0/debian.aws/etc/getabis +++ linux-aws-6.5-6.5.0.orig/debian.aws/etc/getabis @@ -1,15 +0,0 @@ -repo_list=( - "http://archive.ubuntu.com/ubuntu/pool/main/l/linux-aws" - "http://ports.ubuntu.com/ubuntu-ports/pool/main/l/linux-aws" - "http://archive.ubuntu.com/ubuntu/pool/universe/l/linux-aws" - "http://ports.ubuntu.com/ubuntu-ports/pool/universe/l/linux-aws" - "http://ppa.launchpad.net/canonical-kernel-team/ppa/ubuntu/pool/main/l/linux-aws" - "http://ppa.launchpad.net/canonical-kernel-team/ppa2/ubuntu/pool/main/l/linux-aws" - "http://ppa.launchpad.net/canonical-kernel-team/unstable/ubuntu/pool/main/l/linux-aws" - "https://launchpad.net/~canonical-kernel-team/+archive/ubuntu/bootstrap/+files" -) - -package_prefixes linux-image linux-modules - -getall amd64 aws -getall arm64 aws diff -u linux-aws-6.5-6.5.0/debian.aws/reconstruct linux-aws-6.5-6.5.0/debian.aws/reconstruct --- linux-aws-6.5-6.5.0/debian.aws/reconstruct +++ linux-aws-6.5-6.5.0/debian.aws/reconstruct @@ -19,7 +19,6 @@ chmod +x 'debian/scripts/misc/fips-checks' chmod +x 'debian/scripts/misc/fw-to-ihex.sh' chmod +x 'debian/scripts/misc/gen-auto-reconstruct' -chmod +x 'debian/scripts/misc/getabis' chmod +x 'debian/scripts/misc/git-ubuntu-log' chmod +x 'debian/scripts/misc/insert-changes' chmod +x 'debian/scripts/misc/insert-mainline-changes' diff -u linux-aws-6.5-6.5.0/debian.aws/tracking-bug linux-aws-6.5-6.5.0/debian.aws/tracking-bug --- linux-aws-6.5-6.5.0/debian.aws/tracking-bug +++ linux-aws-6.5-6.5.0/debian.aws/tracking-bug @@ -1 +1 @@ -2055564 2024.03.04-1 +2059686 s2024.03.04-1 diff -u linux-aws-6.5-6.5.0/debian.master/changelog linux-aws-6.5-6.5.0/debian.master/changelog --- linux-aws-6.5-6.5.0/debian.master/changelog +++ linux-aws-6.5-6.5.0/debian.master/changelog @@ -1,3 +1,36 @@ +linux (6.5.0-28.29) mantic; urgency=medium + + * mantic/linux: 6.5.0-28.29 -proposed tracker (LP: #2059706) + + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + + * Remove getabis scripts (LP: #2059143) + - [Packaging] Remove getabis + + * CVE-2023-52600 + - jfs: fix uaf in jfs_evict_inode + + * Mantic update: upstream stable patchset 2024-03-27 (LP: #2059284) // + CVE-2023-52603 + - UBSAN: array-index-out-of-bounds in dtSplitRoot + + * CVE-2024-26581 + - netfilter: nft_set_rbtree: skip end interval element from gc + + * Mantic update: upstream stable patchset 2024-03-07 (LP: #2056403) // + CVE-2024-26589 + - bpf: Reject variable offset alu on PTR_TO_FLOW_KEYS + + * Mantic update: upstream stable patchset 2024-03-07 (LP: #2056403) // + CVE-2024-26591 + - bpf: Fix re-attachment branch in bpf_tracing_prog_attach + + * iwlwifi disconnect and crash - intel wifi7 (LP: #2058808) + - wifi: iwlwifi: pcie: fix RB status reading + + -- Manuel Diewald Thu, 28 Mar 2024 19:28:42 +0100 + linux (6.5.0-27.28) mantic; urgency=medium * mantic/linux: 6.5.0-27.28 -proposed tracker (LP: #2055584) reverted: --- linux-aws-6.5-6.5.0/debian.master/etc/getabis +++ linux-aws-6.5-6.5.0.orig/debian.master/etc/getabis @@ -1,19 +0,0 @@ -repo_list=( - "http://archive.ubuntu.com/ubuntu/pool/main/l/linux" - "http://ports.ubuntu.com/ubuntu-ports/pool/main/l/linux" - "http://archive.ubuntu.com/ubuntu/pool/universe/l/linux" - "http://ports.ubuntu.com/ubuntu-ports/pool/universe/l/linux" - "http://ppa.launchpad.net/canonical-kernel-team/ppa/ubuntu/pool/main/l/linux" - "http://ppa.launchpad.net/canonical-kernel-team/unstable/ubuntu/pool/main/l/linux" - "http://ppa.launchpad.net/canonical-kernel-team/bootstrap/ubuntu/pool/main/l/linux" - "http://ppa.launchpad.net/canonical-kernel-team/unstable/ubuntu/pool/main/l/linux-unstable" - "http://ppa.launchpad.net/canonical-kernel-team/bootstrap/ubuntu/pool/main/l/linux-unstable" -) - -package_prefixes linux-buildinfo - -getall armhf generic -getall amd64 generic -getall arm64 generic generic-64k -getall ppc64el generic -getall s390x generic diff -u linux-aws-6.5-6.5.0/debian.master/reconstruct linux-aws-6.5-6.5.0/debian.master/reconstruct --- linux-aws-6.5-6.5.0/debian.master/reconstruct +++ linux-aws-6.5-6.5.0/debian.master/reconstruct @@ -18,7 +18,6 @@ chmod +x 'debian/scripts/misc/fips-checks' chmod +x 'debian/scripts/misc/fw-to-ihex.sh' chmod +x 'debian/scripts/misc/gen-auto-reconstruct' -chmod +x 'debian/scripts/misc/getabis' chmod +x 'debian/scripts/misc/git-ubuntu-log' chmod +x 'debian/scripts/misc/insert-changes' chmod +x 'debian/scripts/misc/insert-mainline-changes' diff -u linux-aws-6.5-6.5.0/debian.master/tracking-bug linux-aws-6.5-6.5.0/debian.master/tracking-bug --- linux-aws-6.5-6.5.0/debian.master/tracking-bug +++ linux-aws-6.5-6.5.0/debian.master/tracking-bug @@ -1 +1 @@ -2055584 2024.03.04-1 +2059706 s2024.03.04-1 diff -u linux-aws-6.5-6.5.0/debian/changelog linux-aws-6.5-6.5.0/debian/changelog --- linux-aws-6.5-6.5.0/debian/changelog +++ linux-aws-6.5-6.5.0/debian/changelog @@ -1,3 +1,38 @@ +linux-aws-6.5 (6.5.0-1018.18~22.04.1) jammy; urgency=medium + + * jammy/linux-aws-6.5: 6.5.0-1018.18~22.04.1 -proposed tracker (LP: #2059685) + + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + + [ Ubuntu: 6.5.0-1018.18 ] + + * mantic/linux-aws: 6.5.0-1018.18 -proposed tracker (LP: #2059686) + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + * mantic/linux: 6.5.0-28.29 -proposed tracker (LP: #2059706) + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + * Remove getabis scripts (LP: #2059143) + - [Packaging] Remove getabis + * CVE-2023-52600 + - jfs: fix uaf in jfs_evict_inode + * Mantic update: upstream stable patchset 2024-03-27 (LP: #2059284) // + CVE-2023-52603 + - UBSAN: array-index-out-of-bounds in dtSplitRoot + * CVE-2024-26581 + - netfilter: nft_set_rbtree: skip end interval element from gc + * Mantic update: upstream stable patchset 2024-03-07 (LP: #2056403) // + CVE-2024-26589 + - bpf: Reject variable offset alu on PTR_TO_FLOW_KEYS + * Mantic update: upstream stable patchset 2024-03-07 (LP: #2056403) // + CVE-2024-26591 + - bpf: Fix re-attachment branch in bpf_tracing_prog_attach + * iwlwifi disconnect and crash - intel wifi7 (LP: #2058808) + - wifi: iwlwifi: pcie: fix RB status reading + + -- Philip Cox Fri, 05 Apr 2024 09:24:14 -0400 + linux-aws-6.5 (6.5.0-1017.17~22.04.2) jammy; urgency=medium * Packaging resync (LP: #1786013) diff -u linux-aws-6.5-6.5.0/debian/control linux-aws-6.5-6.5.0/debian/control --- linux-aws-6.5-6.5.0/debian/control +++ linux-aws-6.5-6.5.0/debian/control @@ -70,7 +70,7 @@ XS-Testsuite: autopkgtest #XS-Testsuite-Depends: gcc-4.7 binutils -Package: linux-aws-6.5-headers-6.5.0-1017 +Package: linux-aws-6.5-headers-6.5.0-1018 Build-Profiles: Architecture: all Multi-Arch: foreign @@ -81,46 +81,46 @@ Description: Header files related to Linux kernel version 6.5.0 This package provides kernel header files for version 6.5.0, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-aws-6.5-headers-6.5.0-1017/debian.README.gz for details + /usr/share/doc/linux-aws-6.5-headers-6.5.0-1018/debian.README.gz for details -Package: linux-aws-6.5-tools-6.5.0-1017 +Package: linux-aws-6.5-tools-6.5.0-1018 Build-Profiles: Architecture: amd64 arm64 Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common -Description: Linux kernel version specific tools for version 6.5.0-1017 +Description: Linux kernel version specific tools for version 6.5.0-1018 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 6.5.0-1017 on + version 6.5.0-1018 on 64 bit x86. - You probably want to install linux-tools-6.5.0-1017-. + You probably want to install linux-tools-6.5.0-1018-. -Package: linux-aws-6.5-cloud-tools-6.5.0-1017 +Package: linux-aws-6.5-cloud-tools-6.5.0-1018 Build-Profiles: Architecture: amd64 arm64 Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-tools-common -Description: Linux kernel version specific cloud tools for version 6.5.0-1017 +Description: Linux kernel version specific cloud tools for version 6.5.0-1018 This package provides the architecture dependant parts for kernel - version locked tools for cloud tools for version 6.5.0-1017 on + version locked tools for cloud tools for version 6.5.0-1018 on 64 bit x86. - You probably want to install linux-cloud-tools-6.5.0-1017-. + You probably want to install linux-cloud-tools-6.5.0-1018-. -Package: linux-image-unsigned-6.5.0-1017-aws +Package: linux-image-unsigned-6.5.0-1018-aws Build-Profiles: Architecture: amd64 arm64 Section: kernel Priority: optional Provides: linux-image, fuse-module, ${linux:rprovides} -Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-6.5.0-1017-aws +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-6.5.0-1018-aws Recommends: grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | grub-efi-arm64 [arm64], initramfs-tools | linux-initramfs-tool Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x] -Conflicts: linux-image-6.5.0-1017-aws -Suggests: fdutils, linux-aws-6.5-doc-6.5.0 | linux-aws-6.5-source-6.5.0, linux-aws-6.5-tools, linux-headers-6.5.0-1017-aws +Conflicts: linux-image-6.5.0-1018-aws +Suggests: fdutils, linux-aws-6.5-doc-6.5.0 | linux-aws-6.5-source-6.5.0, linux-aws-6.5-tools, linux-headers-6.5.0-1018-aws Description: Linux kernel image for version 6.5.0 on 64 bit x86 SMP This package contains the unsigned Linux kernel image for version 6.5.0 on 64 bit x86 SMP. @@ -133,12 +133,12 @@ the linux-aws meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-6.5.0-1017-aws +Package: linux-modules-6.5.0-1018-aws Build-Profiles: Architecture: amd64 arm64 Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1017-aws | linux-image-unsigned-6.5.0-1017-aws +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-6.5.0-1018-aws | linux-image-unsigned-6.5.0-1018-aws Built-Using: ${linux:BuiltUsing} Description: Linux kernel extra modules for version 6.5.0 on 64 bit x86 SMP Contains the corresponding System.map file, the modules built by the @@ -153,12 +153,12 @@ the linux-aws meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-extra-6.5.0-1017-aws +Package: linux-modules-extra-6.5.0-1018-aws Build-Profiles: Architecture: amd64 arm64 Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, wireless-regdb, linux-modules-6.5.0-1017-aws +Depends: ${misc:Depends}, ${shlibs:Depends}, wireless-regdb, linux-modules-6.5.0-1018-aws Description: Linux kernel extra modules for version 6.5.0 on 64 bit x86 SMP This package contains the Linux kernel extra modules for version 6.5.0 on 64 bit x86 SMP. @@ -171,21 +171,21 @@ the linux-modules-extra-aws meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-6.5.0-1017-aws +Package: linux-headers-6.5.0-1018-aws Build-Profiles: Architecture: amd64 arm64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-aws-6.5-headers-6.5.0-1017, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-aws-6.5-headers-6.5.0-1018, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 6.5.0 on 64 bit x86 SMP This package provides kernel header files for version 6.5.0 on 64 bit x86 SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-6.5.0-1017/debian.README.gz for details. + /usr/share/doc/linux-headers-6.5.0-1018/debian.README.gz for details. -Package: linux-image-unsigned-6.5.0-1017-aws-dbgsym +Package: linux-image-unsigned-6.5.0-1018-aws-dbgsym Build-Profiles: Architecture: amd64 arm64 Section: devel @@ -202,27 +202,27 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-6.5.0-1017-aws +Package: linux-tools-6.5.0-1018-aws Build-Profiles: Architecture: amd64 arm64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-aws-6.5-tools-6.5.0-1017 -Description: Linux kernel version specific tools for version 6.5.0-1017 +Depends: ${misc:Depends}, linux-aws-6.5-tools-6.5.0-1018 +Description: Linux kernel version specific tools for version 6.5.0-1018 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 6.5.0-1017 on + version 6.5.0-1018 on 64 bit x86. -Package: linux-cloud-tools-6.5.0-1017-aws +Package: linux-cloud-tools-6.5.0-1018-aws Build-Profiles: Architecture: amd64 arm64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-aws-6.5-cloud-tools-6.5.0-1017 -Description: Linux kernel version specific cloud tools for version 6.5.0-1017 +Depends: ${misc:Depends}, linux-aws-6.5-cloud-tools-6.5.0-1018 +Description: Linux kernel version specific cloud tools for version 6.5.0-1018 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 6.5.0-1017 on + version locked tools for cloud for version 6.5.0-1018 on 64 bit x86. Package: linux-udebs-aws @@ -236,7 +236,7 @@ for easier version and migration tracking. -Package: linux-buildinfo-6.5.0-1017-aws +Package: linux-buildinfo-6.5.0-1018-aws Build-Profiles: Architecture: amd64 arm64 Section: kernel reverted: --- linux-aws-6.5-6.5.0/debian/scripts/misc/getabis +++ linux-aws-6.5-6.5.0.orig/debian/scripts/misc/getabis @@ -1,222 +0,0 @@ -#!/bin/bash - -export LC_ALL=C.UTF-8 - -if [ "$#" = "1" ]; then - set - $(echo "$1" | sed -e 's/-/ /') -fi -if [ "$#" != "2" ]; then - echo "Usage: $0 " 1>&2 - echo "Usage: $0 " 1>&2 - exit 1 -fi - -if [ "$DEBIAN" = "" ]; then - . debian/debian.env -fi - -ver=$1 -revision=$2 -abi=${revision%%.*} - -verabi=$ver-$abi -verfull=$ver-$revision - -WGET="wget --tries=1 --timeout=10 --quiet -c" - -# Check if we use a flat (unversioned) ABI directory -if [ -f "${DEBIAN}/abi/version" ] || \ - grep -qP '^abidir\s+.*/__abi.current/' debian/rules.d/0-common-vars.mk ; then - echo "Using flat ABI directory" - flat_abi=1 - abidir=$(pwd)/${DEBIAN}/abi -else - echo "Using versioned ABI directory" - flat_abi=0 - abidir=$(pwd)/${DEBIAN}/abi/${verfull} -fi - -tmpdir="`pwd`/abi-tmp-$verfull" -origdir="`pwd`" -fwinfo=$abidir/fwinfo - -test -d $tmpdir || mkdir $tmpdir - -package_prefixes() { - : # no longer used ... -} - -getall() { - arch=$1 - shift - - mkdir -p $abidir/$arch - - for sub in $@; do - if [ -f $abidir/$arch/$sub ]; then - echo "Existing $sub($arch)..." - continue - fi - echo "Fetching $sub($arch)..." - getall_set "linux-buildinfo" "$arch" "$sub" || \ - getall_set "linux-image-unsigned linux-modules linux-modules-extra" "$arch" "$sub" || \ - getall_set "linux-image-unsigned linux-modules" "$arch" "$sub" || \ - getall_set "linux-image linux-modules linux-modules-extra" "$arch" "$sub" || \ - getall_set "linux-image linux-modules" "$arch" "$sub" || \ - getall_set "linux-image linux-image-extra" "$arch" "$sub" || \ - getall_set "linux-image" "$arch" "$sub" || \ - { echo "FAILED"; exit 1; } - done -} -getall_set() -{ - prefixes="$1" - arch="$2" - sub="$3" - ( - echo -n " set:" - filenames="" - cd $tmpdir - found=1 - for prefix in $prefixes - do - echo -n " $prefix=" - if [ "$found" = 0 ]; then - echo -n "-" - continue - fi - filename=${prefix}-${verabi}-${sub}_${verfull}_${arch}.deb - for r in "${repo_list[@]}" - do - if ! [ -f $filename ]; then - $WGET $r/$filename - rc="$?" - # If this was not successful or a valid error - # return from the server all bets are off, bail. - [ "$rc" != 0 -a "$rc" != 8 ] && return 2 - fi - if [ -f $filename ]; then - echo -n "y" - filenames="$filenames $filename" - break - fi - done - if [ ! -f "$filename" ]; then - echo -n "n" - found=0 - fi - done - echo "" - if [ "$found" = 0 ]; then - return 1 - fi - echo " extracting..." - for filename in $filenames - do - dpkg-deb --extract $filename tmp - done - # FORM 1: linux-image et al extracted here. - if [ -d tmp/boot ]; then - echo " images..." - find tmp -name "*.ko" | while read f; do - modinfo $f | grep ^firmware >> $fwinfo - done - if [ -f tmp/boot/abi-* ]; then - mv tmp/boot/abi-* $abidir/$arch/$sub - else - echo " NO ABI FILE" - fi - if [ -f tmp/boot/retpoline-* ]; then - mv tmp/boot/retpoline-* $abidir/$arch/$sub.retpoline - else - echo " NO RETPOLINE FILE" - fi - (cd tmp; find lib/modules/$verabi-$sub/kernel -name '*.ko') | \ - sed -e 's/.*\/\([^\/]*\)\.ko/\1/' | sort > \ - $abidir/$arch/$sub.modules - ( - cd tmp; - # Prevent exposing some errors when called by python scripts. SIGPIPE seems to get - # exposed when using the `find ...` form of the command. - ko=$(find lib/modules/$verabi-$sub/kernel \ - -name '*.ko' | head -1) - readelf -p .comment "$ko" | gawk ' - ($1 == "[") { - printf("%s", $3); - for (n=4; n<=NF; n++) { - printf(" %s", $n); - } - print "" - }' | sort -u >$abidir/$arch/$sub.compiler - version=`cat $abidir/$arch/$sub.compiler` - echo " $version" - ) - # FORM 2: moduleinfo packages - # cranky fix -- modinfo supported - else - echo " buildinfo..." - base="tmp/usr/lib/linux/${verabi}-${sub}" - mv "$base/abi" "$abidir/$arch/$sub" - for comp in 'modules' 'retpoline' 'compiler' - do - mv "$base/$comp" "$abidir/$arch/$sub.$comp" - done - if [ -e "${base}"/modules.builtin ] ; then - mv "${base}"/modules.builtin "${abidir}/${arch}/${sub}".modules.builtin - fi - cat "$base/fwinfo" >>"$fwinfo" - if [ -e "${base}"/fwinfo.builtin ] ; then - cat "${base}"/fwinfo.builtin >> "${fwinfo}".builtin - fi - fi - rm -rf tmp $filenames - echo " done" - ) - rc="$?" - if [ "$rc" = 2 ]; then - echo "ERROR: downloads are reporting network failures" 1>&2 - exit 1 - fi - return "$rc" -} - -# MAIN - -# Setup abi directory -rm -rf "${abidir}" -mkdir -p $abidir -echo $abi > $abidir/abiname -if [ ${flat_abi} -eq 1 ] ; then - echo "${verfull}" > "${abidir}"/version -fi - -# NOTE: The flavours are hardcoded, because they may have changed from the -# current build. - -. $DEBIAN/etc/getabis - -# Extract compiler source package version from e.g.: -# GCC: (Ubuntu/Linaro 4.8.2-19ubuntu1) 4.8.2 -compilers=`sed 's/^.*(.* \(.*\)).*$/\1/' $abidir/*/*.compiler | sort -u | wc -l` -if [ "$compilers" != 1 ]; then - echo "WARNING: inconsistent compiler versions detected:" 1>&2 - sort -u $abidir/*/*.compiler | sed 's/^/WARNING: /' 1>&2 -fi - -# Sort fwinfo files -sort < $fwinfo | uniq > fwinfo.tmp -mv fwinfo.tmp $fwinfo -if [ -e "${fwinfo}".builtin ] ; then - sort < "${fwinfo}".builtin | uniq > fwinfo.tmp - mv fwinfo.tmp "${fwinfo}".builtin -fi - -rmdir $tmpdir - -# If this is running in a git repo, add the new ABI directory, remove the old -if [ -d ".git" ]; then - git add "${abidir}" - if [ ${flat_abi} -eq 0 ] ; then - find "$DEBIAN"/abi/* -maxdepth 0 -type d | grep -v "$verfull" | while read f; do git rm -rf "$f"; done - fi -fi diff -u linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/internal.h linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/internal.h --- linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/internal.h +++ linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/internal.h @@ -190,17 +190,17 @@ * iwl_get_closed_rb_stts - get closed rb stts from different structs * @rxq - the rxq to get the rb stts from */ -static inline __le16 iwl_get_closed_rb_stts(struct iwl_trans *trans, - struct iwl_rxq *rxq) +static inline u16 iwl_get_closed_rb_stts(struct iwl_trans *trans, + struct iwl_rxq *rxq) { if (trans->trans_cfg->device_family >= IWL_DEVICE_FAMILY_AX210) { __le16 *rb_stts = rxq->rb_stts; - return READ_ONCE(*rb_stts); + return le16_to_cpu(READ_ONCE(*rb_stts)); } else { struct iwl_rb_status *rb_stts = rxq->rb_stts; - return READ_ONCE(rb_stts->closed_rb_num); + return le16_to_cpu(READ_ONCE(rb_stts->closed_rb_num)) & 0xFFF; } } diff -u linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/rx.c linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/rx.c --- linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/rx.c +++ linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/rx.c @@ -1510,7 +1510,7 @@ spin_lock(&rxq->lock); /* uCode's read index (stored in shared DRAM) indicates the last Rx * buffer that the driver may process (last buffer filled by ucode). */ - r = le16_to_cpu(iwl_get_closed_rb_stts(trans, rxq)) & 0x0FFF; + r = iwl_get_closed_rb_stts(trans, rxq); i = rxq->read; /* W/A 9000 device step A0 wrap-around bug */ diff -u linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/trans.c linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/trans.c --- linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/trans.c +++ linux-aws-6.5-6.5.0/drivers/net/wireless/intel/iwlwifi/pcie/trans.c @@ -2691,11 +2691,9 @@ pos += scnprintf(buf + pos, bufsz - pos, "\tfree_count: %u\n", rxq->free_count); if (rxq->rb_stts) { - u32 r = __le16_to_cpu(iwl_get_closed_rb_stts(trans, - rxq)); + u32 r = iwl_get_closed_rb_stts(trans, rxq); pos += scnprintf(buf + pos, bufsz - pos, - "\tclosed_rb_num: %u\n", - r & 0x0FFF); + "\tclosed_rb_num: %u\n", r); } else { pos += scnprintf(buf + pos, bufsz - pos, "\tclosed_rb_num: Not Allocated\n"); @@ -3068,7 +3066,7 @@ spin_lock_bh(&rxq->lock); - r = le16_to_cpu(iwl_get_closed_rb_stts(trans, rxq)) & 0x0FFF; + r = iwl_get_closed_rb_stts(trans, rxq); for (i = rxq->read, j = 0; i != r && j < allocated_rb_nums; @@ -3364,9 +3362,7 @@ /* Dump RBs is supported only for pre-9000 devices (1 queue) */ struct iwl_rxq *rxq = &trans_pcie->rxq[0]; /* RBs */ - num_rbs = - le16_to_cpu(iwl_get_closed_rb_stts(trans, rxq)) - & 0x0FFF; + num_rbs = iwl_get_closed_rb_stts(trans, rxq); num_rbs = (num_rbs - rxq->read) & RX_QUEUE_MASK; len += num_rbs * (sizeof(*data) + sizeof(struct iwl_fw_error_dump_rb) + diff -u linux-aws-6.5-6.5.0/kernel/bpf/syscall.c linux-aws-6.5-6.5.0/kernel/bpf/syscall.c --- linux-aws-6.5-6.5.0/kernel/bpf/syscall.c +++ linux-aws-6.5-6.5.0/kernel/bpf/syscall.c @@ -3168,6 +3168,10 @@ * * - if prog->aux->dst_trampoline and tgt_prog is NULL, the program * was detached and is going for re-attachment. + * + * - if prog->aux->dst_trampoline is NULL and tgt_prog and prog->aux->attach_btf + * are NULL, then program was already attached and user did not provide + * tgt_prog_fd so we have no way to find out or create trampoline */ if (!prog->aux->dst_trampoline && !tgt_prog) { /* @@ -3181,6 +3185,11 @@ err = -EINVAL; goto out_unlock; } + /* We can allow re-attach only if we have valid attach_btf. */ + if (!prog->aux->attach_btf) { + err = -EINVAL; + goto out_unlock; + } btf_id = prog->aux->attach_btf_id; key = bpf_trampoline_compute_key(NULL, prog->aux->attach_btf, btf_id); } diff -u linux-aws-6.5-6.5.0/kernel/bpf/verifier.c linux-aws-6.5-6.5.0/kernel/bpf/verifier.c --- linux-aws-6.5-6.5.0/kernel/bpf/verifier.c +++ linux-aws-6.5-6.5.0/kernel/bpf/verifier.c @@ -11933,6 +11933,10 @@ } switch (base_type(ptr_reg->type)) { + case PTR_TO_FLOW_KEYS: + if (known) + break; + fallthrough; case CONST_PTR_TO_MAP: /* smin_val represents the known value */ if (known && smin_val == 0 && opcode == BPF_ADD) diff -u linux-aws-6.5-6.5.0/net/netfilter/nft_set_rbtree.c linux-aws-6.5-6.5.0/net/netfilter/nft_set_rbtree.c --- linux-aws-6.5-6.5.0/net/netfilter/nft_set_rbtree.c +++ linux-aws-6.5-6.5.0/net/netfilter/nft_set_rbtree.c @@ -235,7 +235,7 @@ static const struct nft_rbtree_elem * nft_rbtree_gc_elem(const struct nft_set *__set, struct nft_rbtree *priv, - struct nft_rbtree_elem *rbe, u8 genmask) + struct nft_rbtree_elem *rbe) { struct nft_set *set = (struct nft_set *)__set; struct rb_node *prev = rb_prev(&rbe->node); @@ -254,7 +254,7 @@ while (prev) { rbe_prev = rb_entry(prev, struct nft_rbtree_elem, node); if (nft_rbtree_interval_end(rbe_prev) && - nft_set_elem_active(&rbe_prev->ext, genmask)) + nft_set_elem_active(&rbe_prev->ext, NFT_GENMASK_ANY)) break; prev = rb_prev(prev); @@ -365,7 +365,7 @@ nft_set_elem_active(&rbe->ext, cur_genmask)) { const struct nft_rbtree_elem *removed_end; - removed_end = nft_rbtree_gc_elem(set, priv, rbe, genmask); + removed_end = nft_rbtree_gc_elem(set, priv, rbe); if (IS_ERR(removed_end)) return PTR_ERR(removed_end); only in patch2: unchanged: --- linux-aws-6.5-6.5.0.orig/fs/jfs/jfs_dtree.c +++ linux-aws-6.5-6.5.0/fs/jfs/jfs_dtree.c @@ -1970,7 +1970,7 @@ do { f = &rp->slot[fsi]; fsi = f->next; - } while (fsi != -1); + } while (fsi >= 0); f->next = n; } only in patch2: unchanged: --- linux-aws-6.5-6.5.0.orig/fs/jfs/jfs_mount.c +++ linux-aws-6.5-6.5.0/fs/jfs/jfs_mount.c @@ -172,15 +172,15 @@ } jfs_info("jfs_mount: ipimap:0x%p", ipimap); - /* map further access of per fileset inodes by the fileset inode */ - sbi->ipimap = ipimap; - /* initialize fileset inode allocation map */ if ((rc = diMount(ipimap))) { jfs_err("jfs_mount: diMount failed w/rc = %d", rc); goto err_ipimap; } + /* map further access of per fileset inodes by the fileset inode */ + sbi->ipimap = ipimap; + return rc; /*