diff -u linux-riscv-5.15-5.15.0/debian.master/changelog linux-riscv-5.15-5.15.0/debian.master/changelog --- linux-riscv-5.15-5.15.0/debian.master/changelog +++ linux-riscv-5.15-5.15.0/debian.master/changelog @@ -1,3 +1,39 @@ +linux (5.15.0-105.115) jammy; urgency=medium + + * jammy/linux: 5.15.0-105.115 -proposed tracker (LP: #2061372) + + * Jammy update: v5.15.149 upstream stable release (LP: #2059014) // CIFS + stopped working/is unstable with kernel update to 5.15.0-102.112 + (LP: #2060780) + - smb3: Replace smb2pdu 1-element arrays with flex-arrays + + -- Roxana Nicolescu Mon, 15 Apr 2024 10:38:15 +0200 + +linux (5.15.0-103.113) jammy; urgency=medium + + * jammy/linux: 5.15.0-103.113 -proposed tracker (LP: #2059683) + + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + + * Remove getabis scripts (LP: #2059143) + - [Packaging] Remove getabis + + * CVE-2023-24023 + - Bluetooth: Add more enc key size check + + * CVE-2023-52600 + - jfs: fix uaf in jfs_evict_inode + + * Jammy update: v5.15.149 upstream stable release (LP: #2059014) // + CVE-2023-52603 + - UBSAN: array-index-out-of-bounds in dtSplitRoot + + * CVE-2024-26581 + - netfilter: nft_set_rbtree: skip end interval element from gc + + -- Manuel Diewald Thu, 28 Mar 2024 19:21:10 +0100 + linux (5.15.0-102.112) jammy; urgency=medium * jammy/linux: 5.15.0-102.112 -proposed tracker (LP: #2055632) reverted: --- linux-riscv-5.15-5.15.0/debian.master/etc/getabis +++ linux-riscv-5.15-5.15.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/ppa2/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" -) - -package_prefixes linux-buildinfo - -getall armhf generic -getall armhf generic-lpae -getall amd64 generic -getall arm64 generic generic-64k -getall ppc64el generic -getall s390x generic diff -u linux-riscv-5.15-5.15.0/debian.master/reconstruct linux-riscv-5.15-5.15.0/debian.master/reconstruct --- linux-riscv-5.15-5.15.0/debian.master/reconstruct +++ linux-riscv-5.15-5.15.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-riscv-5.15-5.15.0/debian.master/tracking-bug linux-riscv-5.15-5.15.0/debian.master/tracking-bug --- linux-riscv-5.15-5.15.0/debian.master/tracking-bug +++ linux-riscv-5.15-5.15.0/debian.master/tracking-bug @@ -1 +1 @@ -2055632 2024.03.04-1 +2061372 s2024.03.04-2 diff -u linux-riscv-5.15-5.15.0/debian.riscv-5.15/changelog linux-riscv-5.15-5.15.0/debian.riscv-5.15/changelog --- linux-riscv-5.15-5.15.0/debian.riscv-5.15/changelog +++ linux-riscv-5.15-5.15.0/debian.riscv-5.15/changelog @@ -1,3 +1,45 @@ +linux-riscv-5.15 (5.15.0-1056.60~20.04.1) focal; urgency=medium + + * focal/linux-riscv-5.15: 5.15.0-1056.60~20.04.1 -proposed tracker + (LP: #2061510) + + [ Ubuntu: 5.15.0-105.115 ] + + * jammy/linux: 5.15.0-105.115 -proposed tracker (LP: #2061372) + * Jammy update: v5.15.149 upstream stable release (LP: #2059014) // CIFS + stopped working/is unstable with kernel update to 5.15.0-102.112 + (LP: #2060780) + - smb3: Replace smb2pdu 1-element arrays with flex-arrays + + -- Roxana Nicolescu Mon, 15 Apr 2024 19:51:48 +0200 + +linux-riscv-5.15 (5.15.0-1054.58~20.04.1) focal; urgency=medium + + * focal/linux-riscv-5.15: 5.15.0-1054.58~20.04.1 -proposed tracker + (LP: #2059682) + + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + + [ Ubuntu: 5.15.0-103.113 ] + + * jammy/linux: 5.15.0-103.113 -proposed tracker (LP: #2059683) + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + * Remove getabis scripts (LP: #2059143) + - [Packaging] Remove getabis + * CVE-2023-24023 + - Bluetooth: Add more enc key size check + * CVE-2023-52600 + - jfs: fix uaf in jfs_evict_inode + * Jammy update: v5.15.149 upstream stable release (LP: #2059014) // + CVE-2023-52603 + - UBSAN: array-index-out-of-bounds in dtSplitRoot + * CVE-2024-26581 + - netfilter: nft_set_rbtree: skip end interval element from gc + + -- Guoqing Jiang Tue, 09 Apr 2024 09:10:16 +0800 + linux-riscv-5.15 (5.15.0-1053.57~20.04.1) focal; urgency=medium * focal/linux-riscv-5.15: 5.15.0-1053.57~20.04.1 -proposed tracker reverted: --- linux-riscv-5.15-5.15.0/debian.riscv-5.15/etc/getabis +++ linux-riscv-5.15-5.15.0.orig/debian.riscv-5.15/etc/getabis @@ -1,14 +0,0 @@ -repo_list=( - "http://archive.ubuntu.com/ubuntu/pool/main/l/linux-riscv-5.15" - "http://ports.ubuntu.com/ubuntu-ports/pool/main/l/linux-riscv-5.15" - "http://archive.ubuntu.com/ubuntu/pool/universe/l/linux-riscv-5.15" - "http://ports.ubuntu.com/ubuntu-ports/pool/universe/l/linux-riscv-5.15" - "http://ppa.launchpad.net/canonical-kernel-team/ppa/ubuntu/pool/main/l/linux-riscv-5.15" - "http://ppa.launchpad.net/canonical-kernel-team/ppa2/ubuntu/pool/main/l/linux-riscv-5.15" - "http://ppa.launchpad.net/canonical-kernel-team/unstable/ubuntu/pool/main/l/linux-riscv-5.15" - "http://ppa.launchpad.net/canonical-kernel-team/bootstrap/ubuntu/pool/main/l/linux-riscv-5.15" -) - -package_prefixes linux-buildinfo - -getall riscv64 generic diff -u linux-riscv-5.15-5.15.0/debian.riscv-5.15/reconstruct linux-riscv-5.15-5.15.0/debian.riscv-5.15/reconstruct --- linux-riscv-5.15-5.15.0/debian.riscv-5.15/reconstruct +++ linux-riscv-5.15-5.15.0/debian.riscv-5.15/reconstruct @@ -20,7 +20,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-riscv-5.15-5.15.0/debian.riscv-5.15/tracking-bug linux-riscv-5.15-5.15.0/debian.riscv-5.15/tracking-bug --- linux-riscv-5.15-5.15.0/debian.riscv-5.15/tracking-bug +++ linux-riscv-5.15-5.15.0/debian.riscv-5.15/tracking-bug @@ -1 +1 @@ -2055631 2024.03.04-1 +2061510 s2024.03.04-2 diff -u linux-riscv-5.15-5.15.0/debian/changelog linux-riscv-5.15-5.15.0/debian/changelog --- linux-riscv-5.15-5.15.0/debian/changelog +++ linux-riscv-5.15-5.15.0/debian/changelog @@ -1,3 +1,45 @@ +linux-riscv-5.15 (5.15.0-1056.60~20.04.1) focal; urgency=medium + + * focal/linux-riscv-5.15: 5.15.0-1056.60~20.04.1 -proposed tracker + (LP: #2061510) + + [ Ubuntu: 5.15.0-105.115 ] + + * jammy/linux: 5.15.0-105.115 -proposed tracker (LP: #2061372) + * Jammy update: v5.15.149 upstream stable release (LP: #2059014) // CIFS + stopped working/is unstable with kernel update to 5.15.0-102.112 + (LP: #2060780) + - smb3: Replace smb2pdu 1-element arrays with flex-arrays + + -- Roxana Nicolescu Mon, 15 Apr 2024 19:51:48 +0200 + +linux-riscv-5.15 (5.15.0-1054.58~20.04.1) focal; urgency=medium + + * focal/linux-riscv-5.15: 5.15.0-1054.58~20.04.1 -proposed tracker + (LP: #2059682) + + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + + [ Ubuntu: 5.15.0-103.113 ] + + * jammy/linux: 5.15.0-103.113 -proposed tracker (LP: #2059683) + * Packaging resync (LP: #1786013) + - [Packaging] drop getabis data + * Remove getabis scripts (LP: #2059143) + - [Packaging] Remove getabis + * CVE-2023-24023 + - Bluetooth: Add more enc key size check + * CVE-2023-52600 + - jfs: fix uaf in jfs_evict_inode + * Jammy update: v5.15.149 upstream stable release (LP: #2059014) // + CVE-2023-52603 + - UBSAN: array-index-out-of-bounds in dtSplitRoot + * CVE-2024-26581 + - netfilter: nft_set_rbtree: skip end interval element from gc + + -- Guoqing Jiang Tue, 09 Apr 2024 09:10:16 +0800 + linux-riscv-5.15 (5.15.0-1053.57~20.04.1) focal; urgency=medium * focal/linux-riscv-5.15: 5.15.0-1053.57~20.04.1 -proposed tracker diff -u linux-riscv-5.15-5.15.0/debian/control linux-riscv-5.15-5.15.0/debian/control --- linux-riscv-5.15-5.15.0/debian/control +++ linux-riscv-5.15-5.15.0/debian/control @@ -57,7 +57,7 @@ XS-Testsuite: autopkgtest #XS-Testsuite-Depends: gcc-4.7 binutils -Package: linux-riscv-5.15-headers-5.15.0-1053 +Package: linux-riscv-5.15-headers-5.15.0-1056 Build-Profiles: Architecture: all Multi-Arch: foreign @@ -67,33 +67,33 @@ Description: Header files related to Linux kernel version 5.15.0 This package provides kernel header files for version 5.15.0, for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-riscv-5.15-headers-5.15.0-1053/debian.README.gz for details + /usr/share/doc/linux-riscv-5.15-headers-5.15.0-1056/debian.README.gz for details -Package: linux-riscv-5.15-tools-5.15.0-1053 +Package: linux-riscv-5.15-tools-5.15.0-1056 Build-Profiles: Architecture: riscv64 Section: devel Priority: optional Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common -Description: Linux kernel version specific tools for version 5.15.0-1053 +Description: Linux kernel version specific tools for version 5.15.0-1056 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 5.15.0-1053 on + version 5.15.0-1056 on . - You probably want to install linux-tools-5.15.0-1053-. + You probably want to install linux-tools-5.15.0-1056-. -Package: linux-image-5.15.0-1053-generic +Package: linux-image-5.15.0-1056-generic Build-Profiles: Architecture: riscv64 Section: kernel Priority: optional Provides: linux-image, fuse-module, aufs-dkms, kvm-api-4, redhat-cluster-modules, ivtv-modules, ${linux:rprovides} -Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.15.0-1053-generic +Depends: ${misc:Depends}, ${shlibs:Depends}, kmod, linux-base (>= 4.5ubuntu1~16.04.1), linux-modules-5.15.0-1056-generic Recommends: , initramfs-tools | linux-initramfs-tool Breaks: flash-kernel (<< 3.90ubuntu2) [arm64 armhf], s390-tools (<< 2.3.0-0ubuntu3) [s390x] -Conflicts: linux-image-unsigned-5.15.0-1053-generic -Suggests: fdutils, linux-doc | linux-riscv-5.15-source-5.15.0, linux-riscv-5.15-tools, linux-headers-5.15.0-1053-generic, linux-modules-extra-5.15.0-1053-generic +Conflicts: linux-image-unsigned-5.15.0-1056-generic +Suggests: fdutils, linux-doc | linux-riscv-5.15-source-5.15.0, linux-riscv-5.15-tools, linux-headers-5.15.0-1056-generic, linux-modules-extra-5.15.0-1056-generic Description: Linux kernel image for version 5.15.0 on SMP This package contains the Linux kernel image for version 5.15.0 on SMP. @@ -106,12 +106,12 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-5.15.0-1053-generic +Package: linux-modules-5.15.0-1056-generic Build-Profiles: Architecture: riscv64 Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1053-generic | linux-image-unsigned-5.15.0-1053-generic +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1056-generic | linux-image-unsigned-5.15.0-1056-generic Built-Using: ${linux:BuiltUsing} Description: Linux kernel extra modules for version 5.15.0 on SMP Contains the corresponding System.map file, the modules built by the @@ -126,12 +126,12 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-modules-extra-5.15.0-1053-generic +Package: linux-modules-extra-5.15.0-1056-generic Build-Profiles: Architecture: riscv64 Section: kernel Priority: optional -Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1053-generic | linux-image-unsigned-5.15.0-1053-generic, crda | wireless-crda +Depends: ${misc:Depends}, ${shlibs:Depends}, linux-image-5.15.0-1056-generic | linux-image-unsigned-5.15.0-1056-generic, crda | wireless-crda Description: Linux kernel extra modules for version 5.15.0 on SMP This package contains the Linux kernel extra modules for version 5.15.0 on SMP. @@ -148,21 +148,21 @@ the linux-generic meta-package, which will ensure that upgrades work correctly, and that supporting packages are also installed. -Package: linux-headers-5.15.0-1053-generic +Package: linux-headers-5.15.0-1056-generic Build-Profiles: Architecture: riscv64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-riscv-5.15-headers-5.15.0-1053, ${shlibs:Depends} +Depends: ${misc:Depends}, linux-riscv-5.15-headers-5.15.0-1056, ${shlibs:Depends} Provides: linux-headers, linux-headers-3.0 Description: Linux kernel headers for version 5.15.0 on SMP This package provides kernel header files for version 5.15.0 on SMP. . This is for sites that want the latest kernel headers. Please read - /usr/share/doc/linux-headers-5.15.0-1053/debian.README.gz for details. + /usr/share/doc/linux-headers-5.15.0-1056/debian.README.gz for details. -Package: linux-image-5.15.0-1053-generic-dbgsym +Package: linux-image-5.15.0-1056-generic-dbgsym Build-Profiles: Architecture: riscv64 Section: devel @@ -179,31 +179,31 @@ is uncompressed, and unstripped. This package also includes the unstripped modules. -Package: linux-tools-5.15.0-1053-generic +Package: linux-tools-5.15.0-1056-generic Build-Profiles: Architecture: riscv64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-riscv-5.15-tools-5.15.0-1053 -Description: Linux kernel version specific tools for version 5.15.0-1053 +Depends: ${misc:Depends}, linux-riscv-5.15-tools-5.15.0-1056 +Description: Linux kernel version specific tools for version 5.15.0-1056 This package provides the architecture dependant parts for kernel version locked tools (such as perf and x86_energy_perf_policy) for - version 5.15.0-1053 on + version 5.15.0-1056 on . -Package: linux-cloud-tools-5.15.0-1053-generic +Package: linux-cloud-tools-5.15.0-1056-generic Build-Profiles: Architecture: riscv64 Section: devel Priority: optional -Depends: ${misc:Depends}, linux-riscv-5.15-cloud-tools-5.15.0-1053 -Description: Linux kernel version specific cloud tools for version 5.15.0-1053 +Depends: ${misc:Depends}, linux-riscv-5.15-cloud-tools-5.15.0-1056 +Description: Linux kernel version specific cloud tools for version 5.15.0-1056 This package provides the architecture dependant parts for kernel - version locked tools for cloud for version 5.15.0-1053 on + version locked tools for cloud for version 5.15.0-1056 on . -Package: linux-buildinfo-5.15.0-1053-generic +Package: linux-buildinfo-5.15.0-1056-generic Build-Profiles: Architecture: riscv64 Section: kernel reverted: --- linux-riscv-5.15-5.15.0/debian/scripts/misc/getabis +++ linux-riscv-5.15-5.15.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-riscv-5.15-5.15.0/fs/cifs/smb2misc.c linux-riscv-5.15-5.15.0/fs/cifs/smb2misc.c --- linux-riscv-5.15-5.15.0/fs/cifs/smb2misc.c +++ linux-riscv-5.15-5.15.0/fs/cifs/smb2misc.c @@ -113,7 +113,7 @@ } else if (nc_offset + 1 == non_ctxlen) { cifs_dbg(FYI, "no SPNEGO security blob in negprot rsp\n"); size_of_pad_before_neg_ctxts = 0; - } else if (non_ctxlen == SMB311_NEGPROT_BASE_SIZE) + } else if (non_ctxlen == SMB311_NEGPROT_BASE_SIZE + 1) /* has padding, but no SPNEGO blob */ size_of_pad_before_neg_ctxts = nc_offset - non_ctxlen + 1; else diff -u linux-riscv-5.15-5.15.0/fs/cifs/smb2ops.c linux-riscv-5.15-5.15.0/fs/cifs/smb2ops.c --- linux-riscv-5.15-5.15.0/fs/cifs/smb2ops.c +++ linux-riscv-5.15-5.15.0/fs/cifs/smb2ops.c @@ -5828,7 +5828,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5850,7 +5850,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5871,7 +5871,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5892,7 +5892,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5913,7 +5913,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5934,7 +5934,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, @@ -5955,7 +5955,7 @@ .header_size = sizeof(struct smb2_sync_hdr), .header_preamble_size = 0, .max_header_size = MAX_SMB2_HDR_SIZE, - .read_rsp_size = sizeof(struct smb2_read_rsp) - 1, + .read_rsp_size = sizeof(struct smb2_read_rsp), .lock_cmd = SMB2_LOCK, .cap_unix = 0, .cap_nt_find = SMB2_NT_FIND, diff -u linux-riscv-5.15-5.15.0/fs/cifs/smb2pdu.c linux-riscv-5.15-5.15.0/fs/cifs/smb2pdu.c --- linux-riscv-5.15-5.15.0/fs/cifs/smb2pdu.c +++ linux-riscv-5.15-5.15.0/fs/cifs/smb2pdu.c @@ -1327,7 +1327,7 @@ /* Testing shows that buffer offset must be at location of Buffer[0] */ req->SecurityBufferOffset = - cpu_to_le16(sizeof(struct smb2_sess_setup_req) - 1 /* pad */); + cpu_to_le16(sizeof(struct smb2_sess_setup_req)); req->SecurityBufferLength = cpu_to_le16(sess_data->iov[1].iov_len); memset(&rqst, 0, sizeof(struct smb_rqst)); @@ -1826,8 +1826,7 @@ iov[0].iov_len = total_len - 1; /* Testing shows that buffer offset must be at location of Buffer[0] */ - req->PathOffset = cpu_to_le16(sizeof(struct smb2_tree_connect_req) - - 1 /* pad */); + req->PathOffset = cpu_to_le16(sizeof(struct smb2_tree_connect_req)); req->PathLength = cpu_to_le16(unc_path_len - 2); iov[1].iov_base = unc_path; iov[1].iov_len = unc_path_len; @@ -4748,7 +4747,7 @@ memcpy(bufptr, &asteriks, len); req->FileNameOffset = - cpu_to_le16(sizeof(struct smb2_query_directory_req) - 1); + cpu_to_le16(sizeof(struct smb2_query_directory_req)); req->FileNameLength = cpu_to_le16(len); /* * BB could be 30 bytes or so longer if we used SMB2 specific @@ -4945,7 +4944,7 @@ req->AdditionalInformation = cpu_to_le32(additional_info); req->BufferOffset = - cpu_to_le16(sizeof(struct smb2_set_info_req) - 1); + cpu_to_le16(sizeof(struct smb2_set_info_req)); req->BufferLength = cpu_to_le32(*size); memcpy(req->Buffer, *data, *size); @@ -5177,9 +5176,9 @@ req->VolatileFileId = volatile_fid; /* 1 for pad */ req->InputBufferOffset = - cpu_to_le16(sizeof(struct smb2_query_info_req) - 1); + cpu_to_le16(sizeof(struct smb2_query_info_req)); req->OutputBufferLength = cpu_to_le32( - outbuf_len + sizeof(struct smb2_query_info_rsp) - 1); + outbuf_len + sizeof(struct smb2_query_info_rsp)); iov->iov_base = (char *)req; iov->iov_len = total_len; diff -u linux-riscv-5.15-5.15.0/fs/cifs/smb2pdu.h linux-riscv-5.15-5.15.0/fs/cifs/smb2pdu.h --- linux-riscv-5.15-5.15.0/fs/cifs/smb2pdu.h +++ linux-riscv-5.15-5.15.0/fs/cifs/smb2pdu.h @@ -218,7 +218,7 @@ __le16 StructureSize; __le16 Reserved; /* MBZ */ __le32 ByteCount; /* even if zero, at least one byte follows */ - __u8 ErrorData[1]; /* variable length */ + __u8 ErrorData[]; /* variable length */ } __packed; #define SYMLINK_ERROR_TAG 0x4c4d5953 @@ -487,7 +487,7 @@ __le16 SecurityBufferOffset; __le16 SecurityBufferLength; __le32 NegotiateContextOffset; /* Pre:SMB3.1.1 was reserved/ignored */ - __u8 Buffer[1]; /* variable length GSS security buffer */ + __u8 Buffer[]; /* variable length GSS security buffer */ } __packed; /* Flags */ @@ -504,7 +504,7 @@ __le16 SecurityBufferOffset; __le16 SecurityBufferLength; __u64 PreviousSessionId; - __u8 Buffer[1]; /* variable length GSS security buffer */ + __u8 Buffer[]; /* variable length GSS security buffer */ } __packed; /* Currently defined SessionFlags */ @@ -517,7 +517,7 @@ __le16 SessionFlags; __le16 SecurityBufferOffset; __le16 SecurityBufferLength; - __u8 Buffer[1]; /* variable length GSS security buffer */ + __u8 Buffer[]; /* variable length GSS security buffer */ } __packed; struct smb2_logoff_req { @@ -543,7 +543,7 @@ __le16 Flags; /* Reserved MBZ for dialects prior to SMB3.1.1 */ __le16 PathOffset; __le16 PathLength; - __u8 Buffer[1]; /* variable length */ + __u8 Buffer[]; /* variable length */ } __packed; /* See MS-SMB2 section 2.2.9.2 */ @@ -852,7 +852,7 @@ __u64 VolatileFileId; /* opaque endianness */ __le32 CreateContextsOffset; __le32 CreateContextsLength; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; struct create_context { @@ -1313,7 +1313,7 @@ __le32 RemainingBytes; __le16 ReadChannelInfoOffset; __le16 ReadChannelInfoLength; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; /* Read flags */ @@ -1328,7 +1328,7 @@ __le32 DataLength; __le32 DataRemaining; __u32 Flags; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; /* For write request Flags field below the following flags are defined: */ @@ -1348,7 +1348,7 @@ __le16 WriteChannelInfoOffset; __le16 WriteChannelInfoLength; __le32 Flags; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; struct smb2_write_rsp { @@ -1359,7 +1359,7 @@ __le32 DataLength; __le32 DataRemaining; __u32 Reserved2; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; /* notify flags */ @@ -1395,7 +1395,7 @@ __le16 StructureSize; /* Must be 9 */ __le16 OutputBufferOffset; __le32 OutputBufferLength; - __u8 Buffer[1]; /* array of file notify structs */ + __u8 Buffer[]; /* array of file notify structs */ } __packed; #define SMB2_LOCKFLAG_SHARED_LOCK 0x0001 @@ -1422,7 +1422,10 @@ __u64 PersistentFileId; /* opaque endianness */ __u64 VolatileFileId; /* opaque endianness */ /* Followed by at least one */ - struct smb2_lock_element locks[1]; + union { + struct smb2_lock_element lock; + DECLARE_FLEX_ARRAY(struct smb2_lock_element, locks); + }; } __packed; struct smb2_lock_rsp { @@ -1478,7 +1481,7 @@ __le16 FileNameOffset; __le16 FileNameLength; __le32 OutputBufferLength; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; struct smb2_query_directory_rsp { @@ -1486,7 +1489,7 @@ __le16 StructureSize; /* Must be 9 */ __le16 OutputBufferOffset; __le32 OutputBufferLength; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; /* Possible InfoType values */ @@ -1527,7 +1530,7 @@ __le32 Flags; __u64 PersistentFileId; /* opaque endianness */ __u64 VolatileFileId; /* opaque endianness */ - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; struct smb2_query_info_rsp { @@ -1535,7 +1538,7 @@ __le16 StructureSize; /* Must be 9 */ __le16 OutputBufferOffset; __le32 OutputBufferLength; - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; /* @@ -1558,7 +1561,7 @@ __le32 AdditionalInformation; __u64 PersistentFileId; /* opaque endianness */ __u64 VolatileFileId; /* opaque endianness */ - __u8 Buffer[1]; + __u8 Buffer[]; } __packed; struct smb2_set_info_rsp { @@ -1761,7 +1764,10 @@ __le32 Mode; __le32 AlignmentRequirement; __le32 FileNameLength; - char FileName[1]; + union { + char __pad; /* Legacy structure padding */ + DECLARE_FLEX_ARRAY(char, FileName); + }; } __packed; /* level 18 Query */ struct smb2_file_eof_info { /* encoding of request for level 10 */ diff -u linux-riscv-5.15-5.15.0/fs/jfs/jfs_mount.c linux-riscv-5.15-5.15.0/fs/jfs/jfs_mount.c --- linux-riscv-5.15-5.15.0/fs/jfs/jfs_mount.c +++ linux-riscv-5.15-5.15.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; /* diff -u linux-riscv-5.15-5.15.0/net/bluetooth/hci_event.c linux-riscv-5.15-5.15.0/net/bluetooth/hci_event.c --- linux-riscv-5.15-5.15.0/net/bluetooth/hci_event.c +++ linux-riscv-5.15-5.15.0/net/bluetooth/hci_event.c @@ -3113,6 +3113,7 @@ const struct hci_rp_read_enc_key_size *rp; struct hci_conn *conn; u16 handle; + u8 rp_status; BT_DBG("%s status 0x%02x", hdev->name, status); @@ -3122,6 +3123,7 @@ } rp = (void *)skb->data; + rp_status = rp->status; handle = le16_to_cpu(rp->handle); hci_dev_lock(hdev); @@ -3134,15 +3136,30 @@ * secure approach is to then assume the key size is 0 to force a * disconnection. */ - if (rp->status) { + if (rp_status) { bt_dev_err(hdev, "failed to read key size for handle %u", handle); conn->enc_key_size = 0; } else { conn->enc_key_size = rp->key_size; + rp_status = 0; + + if (conn->enc_key_size < hdev->min_enc_key_size) { + /* As slave role, the conn->state has been set to + * BT_CONNECTED and l2cap conn req might not be received + * yet, at this moment the l2cap layer almost does + * nothing with the non-zero status. + * So we also clear encrypt related bits, and then the + * handler of l2cap conn req will get the right secure + * state at a later time. + */ + rp_status = HCI_ERROR_AUTH_FAILURE; + clear_bit(HCI_CONN_ENCRYPT, &conn->flags); + clear_bit(HCI_CONN_AES_CCM, &conn->flags); + } } - hci_encrypt_cfm(conn, 0); + hci_encrypt_cfm(conn, rp_status); unlock: hci_dev_unlock(hdev); diff -u linux-riscv-5.15-5.15.0/net/netfilter/nft_set_rbtree.c linux-riscv-5.15-5.15.0/net/netfilter/nft_set_rbtree.c --- linux-riscv-5.15-5.15.0/net/netfilter/nft_set_rbtree.c +++ linux-riscv-5.15-5.15.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-riscv-5.15-5.15.0.orig/fs/jfs/jfs_dtree.c +++ linux-riscv-5.15-5.15.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; }