main/linux-postmarketos-qcom-msm8916: add patches for CVE-2021-39685 (MR 2757)

NOTE: Should be likely backported without the kernel config changes
      since Alpine 3.15 still has the older gcc version.

[ci:skip-build] Already built successfully on CI
This commit is contained in:
Minecrell 2021-12-16 14:51:23 +01:00 committed by Bart Ribbers
parent 8c3abf9a1d
commit c1a8c0a631
No known key found for this signature in database
GPG key ID: 0BF4C1B5988C50D8
3 changed files with 20 additions and 7 deletions

View file

@ -5,7 +5,7 @@
_flavor="postmarketos-qcom-msm8916"
pkgname=linux-$_flavor
pkgver=5.15
pkgrel=0
pkgrel=1
pkgdesc="Mainline kernel fork for Qualcomm MSM8916 devices"
arch="aarch64 armv7"
url="https://github.com/msm8916-mainline/linux"
@ -41,6 +41,8 @@ esac
_tag=v${pkgver//_/-}-msm8916
source="
$pkgname-$_tag.tar.gz::$url/archive/$_tag.tar.gz
36dfdf11af49d3c009c711fb16f5c6e7a274505d.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=36dfdf11af49d3c009c711fb16f5c6e7a274505d
6eea4ace62fa6414432692ee44f0c0a3d541d97a.patch::https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/patch/?id=6eea4ace62fa6414432692ee44f0c0a3d541d97a
config-$_flavor.aarch64
config-$_flavor.armv7
"
@ -73,6 +75,8 @@ package() {
sha512sums="
734d958bb9fa64e667e089aec0066a58526ae38fbf6fbd223a7bce746fe3ce7443ffe087f365a44f6892479186f2c0eb33abacd38eb7b0b8d40949602812e441 linux-postmarketos-qcom-msm8916-v5.15-msm8916.tar.gz
edbb49af97c504bb0a1e1129e37aa83a032116a49405199a3c6513676173ebc69ab18cd1b00a22d6141937513e1e24c46c8431fd3513daba068c8b8fd8717979 config-postmarketos-qcom-msm8916.aarch64
cebebc2fccf434b189fe79f2d6114fd2d2191424a46538f68c30a41ecc95927ba242523cfd9ab272e1a86cca39402deaa6d7351156ed283dccd1b9c02b165c3e config-postmarketos-qcom-msm8916.armv7
59d480b6379dcfff94d05b08e28c005d507f640dc0147841e7df4827fce8db01dab1d4d50fb45b2b3fff72cdeb219a8cd87a889078a6372aea4469c861c378b1 36dfdf11af49d3c009c711fb16f5c6e7a274505d.patch
61f862cda24e7b14e55e9a9ce3a537adfc7a1c77e0670255dc485886e2c19156ddaf49fdd88b629ddde3cf25a83fd603678caebb96e18f59245917d3a2e51bb0 6eea4ace62fa6414432692ee44f0c0a3d541d97a.patch
8468e559679019d7a74483beb5f94f9ac75e43aea24aa39303e513258e30c02dead1681472f60ff6ae812b70c24ebe95e597ba75a85d78595b6bb144cbdfd441 config-postmarketos-qcom-msm8916.aarch64
712efefdddfeda5d6e1f200a6973fe5c5a13c70db3d6c3070a856de2682dc3c15b23c199b2232dafd70b25eb1429ce86cb021f47a0390b2c295dd4e135c2aa50 config-postmarketos-qcom-msm8916.armv7
"

View file

@ -2,9 +2,9 @@
# Automatically generated file; DO NOT EDIT.
# Linux/arm64 5.15.0 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027"
CONFIG_CC_VERSION_TEXT="aarch64-alpine-linux-musl-gcc (Alpine 11.2.1_git20211128) 11.2.1 20211128"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=100301
CONFIG_GCC_VERSION=110201
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=23700
@ -12,6 +12,7 @@ CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=23700
CONFIG_LLD_VERSION=0
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_IRQ_WORK=y
@ -5475,6 +5476,8 @@ CONFIG_INIT_STACK_NONE=y
# CONFIG_GCC_PLUGIN_STACKLEAK is not set
# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
# CONFIG_ZERO_CALL_USED_REGS is not set
# end of Memory initialization
# end of Kernel hardening options
# end of Security options
@ -5864,6 +5867,7 @@ CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
CONFIG_ARCH_HAS_UBSAN_SANITIZE_ALL=y
# CONFIG_UBSAN is not set
CONFIG_HAVE_KCSAN_COMPILER=y
# end of Generic Kernel Debugging Instruments
CONFIG_DEBUG_KERNEL=y
@ -5900,6 +5904,7 @@ CONFIG_HAVE_ARCH_KASAN_SW_TAGS=y
CONFIG_HAVE_ARCH_KASAN_HW_TAGS=y
CONFIG_HAVE_ARCH_KASAN_VMALLOC=y
CONFIG_CC_HAS_KASAN_GENERIC=y
CONFIG_CC_HAS_KASAN_SW_TAGS=y
CONFIG_CC_HAS_WORKING_NOSANITIZE_ADDRESS=y
# CONFIG_KASAN is not set
CONFIG_HAVE_ARCH_KFENCE=y

View file

@ -2,9 +2,9 @@
# Automatically generated file; DO NOT EDIT.
# Linux/arm 5.15.0 Kernel Configuration
#
CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 10.3.1_git20211027) 10.3.1 20211027"
CONFIG_CC_VERSION_TEXT="armv7-alpine-linux-musleabihf-gcc (Alpine 11.2.1_git20211128) 11.2.1 20211128"
CONFIG_CC_IS_GCC=y
CONFIG_GCC_VERSION=100301
CONFIG_GCC_VERSION=110201
CONFIG_CLANG_VERSION=0
CONFIG_AS_IS_GNU=y
CONFIG_AS_VERSION=23700
@ -12,6 +12,7 @@ CONFIG_LD_IS_BFD=y
CONFIG_LD_VERSION=23700
CONFIG_LLD_VERSION=0
CONFIG_CC_HAS_ASM_GOTO=y
CONFIG_CC_HAS_ASM_GOTO_OUTPUT=y
CONFIG_CC_HAS_ASM_INLINE=y
CONFIG_CC_HAS_NO_PROFILE_FN_ATTR=y
CONFIG_IRQ_WORK=y
@ -5430,6 +5431,8 @@ CONFIG_INIT_STACK_NONE=y
# CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL is not set
# CONFIG_INIT_ON_ALLOC_DEFAULT_ON is not set
# CONFIG_INIT_ON_FREE_DEFAULT_ON is not set
CONFIG_CC_HAS_ZERO_CALL_USED_REGS=y
# CONFIG_ZERO_CALL_USED_REGS is not set
# end of Memory initialization
# end of Kernel hardening options
# end of Security options
@ -5801,6 +5804,7 @@ CONFIG_DEBUG_FS_ALLOW_ALL=y
CONFIG_HAVE_ARCH_KGDB=y
# CONFIG_KGDB is not set
# CONFIG_UBSAN is not set
CONFIG_HAVE_KCSAN_COMPILER=y
# end of Generic Kernel Debugging Instruments
CONFIG_DEBUG_KERNEL=y