Skip to content

Commit 686f308

Browse files
github-actions[bot]github-actions[bot]
committed
[bot] AutoMerging: merge all upstream's changes:
* https://github.com/coolsnowwolf/lede: armvirt: copy config files from 5.10 (coolsnowwolf#9910) armvirt: refresh 5.10 config (coolsnowwolf#9908) armvirt: enable MMIO_CMDLINE_DEVICES for firecracker support (coolsnowwolf#9907) armvirt: switch to Kernel 5.10 (coolsnowwolf#9906) rockchip: switch kernel version to 5.19 rockchip: add FastRhino R66S support in kernel 5.19 zlib: backport null dereference fix ramips: mt7628: fix memory controller reset bit
2 parents 84214d3 + 17fea87 commit 686f308

File tree

16 files changed

+1255
-74
lines changed

16 files changed

+1255
-74
lines changed

‎package/libs/zlib/patches/007-fix-null-dereference-in-fix-CVE-2022-37434.patch

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
2+
From: Mark Adler <[email protected]>
3+
Date: Mon, 8 Aug 2022 10:50:09 -0700
4+
Subject: [PATCH] Fix extra field processing bug that dereferences NULL
5+
state->head.
6+
7+
The recent commit to fix a gzip header extra field processing bug
8+
introduced the new bug fixed here.
9+
---
10+
inflate.c | 4 ++--
11+
1 file changed, 2 insertions(+), 2 deletions(-)
12+
13+
diff --git a/inflate.c b/inflate.c
14+
index 7a7289749..2a3c4fe98 100644
15+
--- a/inflate.c
16+
+++ b/inflate.c
17+
@@ -763,10 +763,10 @@ int flush;
18+
copy = state->length;
19+
if (copy > have) copy = have;
20+
if (copy) {
21+
- len = state->head->extra_len - state->length;
22+
if (state->head != Z_NULL &&
23+
state->head->extra != Z_NULL &&
24+
- len < state->head->extra_max) {
25+
+ (len = state->head->extra_len - state->length) <
26+
+ state->head->extra_max) {
27+
zmemcpy(state->head->extra + len, next,
28+
len + copy > state->head->extra_max ?
29+
state->head->extra_max - len : copy);

‎target/linux/armvirt/32/config-5.15

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
CONFIG_ALIGNMENT_TRAP=y
2+
CONFIG_ARCH_32BIT_OFF_T=y
3+
CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
4+
CONFIG_ARCH_MULTIPLATFORM=y
5+
CONFIG_ARCH_MULTI_V6_V7=y
6+
CONFIG_ARCH_MULTI_V7=y
7+
CONFIG_ARCH_NR_GPIO=0
8+
CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
9+
CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
10+
CONFIG_ARCH_SELECT_MEMORY_MODEL=y
11+
CONFIG_ARCH_VIRT=y
12+
CONFIG_ARM=y
13+
CONFIG_ARM_CPU_SUSPEND=y
14+
CONFIG_ARM_HAS_SG_CHAIN=y
15+
CONFIG_ARM_HEAVY_MB=y
16+
CONFIG_ARM_L1_CACHE_SHIFT=6
17+
CONFIG_ARM_L1_CACHE_SHIFT_6=y
18+
CONFIG_ARM_LPAE=y
19+
CONFIG_ARM_PATCH_IDIV=y
20+
CONFIG_ARM_PATCH_PHYS_VIRT=y
21+
CONFIG_ARM_PSCI=y
22+
CONFIG_ARM_THUMB=y
23+
CONFIG_ARM_UNWIND=y
24+
CONFIG_ARM_VIRT_EXT=y
25+
CONFIG_AUTO_ZRELADDR=y
26+
CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y
27+
CONFIG_CACHE_L2X0=y
28+
CONFIG_COMPAT_32BIT_TIME=y
29+
CONFIG_CPU_32v6K=y
30+
CONFIG_CPU_32v7=y
31+
CONFIG_CPU_ABRT_EV7=y
32+
CONFIG_CPU_CACHE_V7=y
33+
CONFIG_CPU_CACHE_VIPT=y
34+
CONFIG_CPU_COPY_V6=y
35+
CONFIG_CPU_CP15=y
36+
CONFIG_CPU_CP15_MMU=y
37+
CONFIG_CPU_HAS_ASID=y
38+
CONFIG_CPU_PABRT_V7=y
39+
CONFIG_CPU_SPECTRE=y
40+
CONFIG_CPU_THUMB_CAPABLE=y
41+
CONFIG_CPU_TLB_V7=y
42+
CONFIG_CPU_V7=y
43+
CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S"
44+
CONFIG_DMA_OPS=y
45+
CONFIG_EDAC_ATOMIC_SCRUB=y
46+
CONFIG_GENERIC_IRQ_MULTI_HANDLER=y
47+
CONFIG_GENERIC_VDSO_32=y
48+
CONFIG_HARDEN_BRANCH_PREDICTOR=y
49+
CONFIG_HAVE_SMP=y
50+
CONFIG_HZ_FIXED=0
51+
CONFIG_HZ_PERIODIC=y
52+
CONFIG_MIGHT_HAVE_CACHE_L2X0=y
53+
CONFIG_MODULES_USE_ELF_REL=y
54+
CONFIG_NEON=y
55+
CONFIG_NR_CPUS=4
56+
CONFIG_OLD_SIGACTION=y
57+
CONFIG_OLD_SIGSUSPEND3=y
58+
CONFIG_OUTER_CACHE=y
59+
CONFIG_OUTER_CACHE_SYNC=y
60+
CONFIG_PAGE_OFFSET=0xC0000000
61+
CONFIG_PERF_USE_VMALLOC=y
62+
CONFIG_RTC_MC146818_LIB=y
63+
CONFIG_SERIAL_OF_PLATFORM=y
64+
CONFIG_SMP_ON_UP=y
65+
CONFIG_SWP_EMULATE=y
66+
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
67+
CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
68+
CONFIG_UNWINDER_ARM=y
69+
CONFIG_USE_OF=y
70+
CONFIG_VFP=y
71+
CONFIG_VFPv3=y
72+
CONFIG_XZ_DEC_ARM=y
73+
CONFIG_XZ_DEC_BCJ=y
74+
CONFIG_ZBOOT_ROM_BSS=0
75+
CONFIG_ZBOOT_ROM_TEXT=0

‎target/linux/armvirt/64/config-5.10

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
4141
CONFIG_BACKLIGHT_CLASS_DEVICE=y
4242
CONFIG_BLK_PM=y
4343
CONFIG_CAVIUM_TX2_ERRATUM_219=y
44+
CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
4445
CONFIG_CLK_SP810=y
4546
CONFIG_CLK_VEXPRESS_OSC=y
4647
# CONFIG_COMPAT_32BIT_TIME is not set
@@ -94,7 +95,6 @@ CONFIG_FRAME_POINTER=y
9495
CONFIG_FSL_ERRATUM_A008585=y
9596
CONFIG_FUJITSU_ERRATUM_010001=y
9697
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
97-
CONFIG_GENERIC_CPU_VULNERABILITIES=y
9898
CONFIG_GENERIC_CSUM=y
9999
CONFIG_GPIO_GENERIC=y
100100
CONFIG_GPIO_GENERIC_PLATFORM=y

‎target/linux/armvirt/64/config-5.15

Lines changed: 150 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,150 @@
1+
CONFIG_64BIT=y
2+
CONFIG_ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE=y
3+
CONFIG_ARCH_MMAP_RND_BITS=18
4+
CONFIG_ARCH_MMAP_RND_BITS_MAX=24
5+
CONFIG_ARCH_MMAP_RND_BITS_MIN=18
6+
CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11
7+
CONFIG_ARCH_PROC_KCORE_TEXT=y
8+
CONFIG_ARCH_STACKWALK=y
9+
CONFIG_ARCH_VEXPRESS=y
10+
CONFIG_ARCH_WANTS_NO_INSTR=y
11+
CONFIG_ARM64=y
12+
CONFIG_ARM64_4K_PAGES=y
13+
CONFIG_ARM64_CNP=y
14+
CONFIG_ARM64_CRYPTO=y
15+
CONFIG_ARM64_EPAN=y
16+
CONFIG_ARM64_ERRATUM_1165522=y
17+
CONFIG_ARM64_ERRATUM_1286807=y
18+
CONFIG_ARM64_ERRATUM_819472=y
19+
CONFIG_ARM64_ERRATUM_824069=y
20+
CONFIG_ARM64_ERRATUM_826319=y
21+
CONFIG_ARM64_ERRATUM_827319=y
22+
CONFIG_ARM64_ERRATUM_832075=y
23+
CONFIG_ARM64_ERRATUM_843419=y
24+
CONFIG_ARM64_HW_AFDBM=y
25+
CONFIG_ARM64_LD_HAS_FIX_ERRATUM_843419=y
26+
CONFIG_ARM64_MODULE_PLTS=y
27+
CONFIG_ARM64_PAGE_SHIFT=12
28+
CONFIG_ARM64_PAN=y
29+
CONFIG_ARM64_PA_BITS=48
30+
CONFIG_ARM64_PA_BITS_48=y
31+
CONFIG_ARM64_PTR_AUTH=y
32+
CONFIG_ARM64_PTR_AUTH_KERNEL=y
33+
CONFIG_ARM64_SVE=y
34+
CONFIG_ARM64_TAGGED_ADDR_ABI=y
35+
CONFIG_ARM64_VA_BITS=39
36+
CONFIG_ARM64_VA_BITS_39=y
37+
CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y
38+
CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y
39+
CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y
40+
CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y
41+
CONFIG_ATOMIC64_SELFTEST=y
42+
CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y
43+
CONFIG_BACKLIGHT_CLASS_DEVICE=y
44+
CONFIG_BLK_PM=y
45+
CONFIG_CAVIUM_TX2_ERRATUM_219=y
46+
CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y
47+
CONFIG_CLK_SP810=y
48+
CONFIG_CLK_VEXPRESS_OSC=y
49+
# CONFIG_COMPAT_32BIT_TIME is not set
50+
CONFIG_CPU_IDLE=y
51+
CONFIG_CPU_IDLE_GOV_MENU=y
52+
CONFIG_CPU_PM=y
53+
CONFIG_CRYPTO_AES_ARM64=y
54+
CONFIG_CRYPTO_AES_ARM64_BS=y
55+
CONFIG_CRYPTO_AES_ARM64_CE=y
56+
CONFIG_CRYPTO_AES_ARM64_CE_BLK=y
57+
CONFIG_CRYPTO_AES_ARM64_CE_CCM=y
58+
CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y
59+
CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=y
60+
CONFIG_CRYPTO_CHACHA20=y
61+
CONFIG_CRYPTO_CHACHA20_NEON=y
62+
CONFIG_CRYPTO_CRYPTD=y
63+
CONFIG_CRYPTO_GHASH_ARM64_CE=y
64+
CONFIG_CRYPTO_LIB_CHACHA_GENERIC=y
65+
CONFIG_CRYPTO_SHA1=y
66+
CONFIG_CRYPTO_SHA1_ARM64_CE=y
67+
CONFIG_CRYPTO_SHA256_ARM64=y
68+
CONFIG_CRYPTO_SHA2_ARM64_CE=y
69+
CONFIG_CRYPTO_SHA512_ARM64=y
70+
CONFIG_CRYPTO_SIMD=y
71+
CONFIG_DMA_DIRECT_REMAP=y
72+
CONFIG_DMA_SHARED_BUFFER=y
73+
CONFIG_DRM=y
74+
CONFIG_DRM_BOCHS=y
75+
CONFIG_DRM_BRIDGE=y
76+
CONFIG_DRM_GEM_SHMEM_HELPER=y
77+
CONFIG_DRM_KMS_HELPER=y
78+
CONFIG_DRM_PANEL=y
79+
CONFIG_DRM_PANEL_BRIDGE=y
80+
CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
81+
CONFIG_DRM_QXL=y
82+
CONFIG_DRM_TTM=y
83+
CONFIG_DRM_TTM_HELPER=y
84+
CONFIG_DRM_VIRTIO_GPU=y
85+
CONFIG_DRM_VRAM_HELPER=y
86+
CONFIG_FB=y
87+
CONFIG_FB_ARMCLCD=y
88+
CONFIG_FB_CFB_COPYAREA=y
89+
CONFIG_FB_CFB_FILLRECT=y
90+
CONFIG_FB_CFB_IMAGEBLIT=y
91+
CONFIG_FB_CMDLINE=y
92+
CONFIG_FB_MODE_HELPERS=y
93+
CONFIG_FRAME_POINTER=y
94+
CONFIG_FSL_ERRATUM_A008585=y
95+
CONFIG_FUJITSU_ERRATUM_010001=y
96+
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
97+
CONFIG_GENERIC_CSUM=y
98+
CONFIG_GENERIC_FIND_FIRST_BIT=y
99+
CONFIG_GPIO_GENERIC=y
100+
CONFIG_GPIO_GENERIC_PLATFORM=y
101+
CONFIG_HDMI=y
102+
CONFIG_HW_RANDOM=y
103+
CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
104+
CONFIG_HW_RANDOM_VIRTIO=y
105+
CONFIG_I2C=y
106+
CONFIG_I2C_ALGOBIT=y
107+
CONFIG_I2C_BOARDINFO=y
108+
CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
109+
CONFIG_KCMP=y
110+
CONFIG_LCD_CLASS_DEVICE=m
111+
# CONFIG_LCD_PLATFORM is not set
112+
CONFIG_MFD_CORE=y
113+
CONFIG_MFD_SYSCON=y
114+
CONFIG_MFD_VEXPRESS_SYSREG=y
115+
CONFIG_MMC=y
116+
CONFIG_MMC_ARMMMCI=y
117+
CONFIG_MODULES_USE_ELF_RELA=y
118+
CONFIG_NEED_SG_DMA_LENGTH=y
119+
CONFIG_NO_HZ=y
120+
CONFIG_NO_HZ_COMMON=y
121+
CONFIG_NO_HZ_IDLE=y
122+
CONFIG_NR_CPUS=64
123+
CONFIG_NVIDIA_CARMEL_CNP_ERRATUM=y
124+
CONFIG_PM=y
125+
CONFIG_PM_CLK=y
126+
CONFIG_PM_GENERIC_DOMAINS=y
127+
CONFIG_PM_GENERIC_DOMAINS_OF=y
128+
CONFIG_POWER_RESET=y
129+
CONFIG_POWER_RESET_VEXPRESS=y
130+
CONFIG_POWER_SUPPLY=y
131+
CONFIG_QUEUED_RWLOCKS=y
132+
CONFIG_QUEUED_SPINLOCKS=y
133+
CONFIG_REGMAP=y
134+
CONFIG_REGMAP_MMIO=y
135+
CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
136+
CONFIG_RTC_I2C_AND_SPI=y
137+
CONFIG_SMC91X=y
138+
CONFIG_SPARSEMEM=y
139+
CONFIG_SPARSEMEM_EXTREME=y
140+
CONFIG_SPARSEMEM_VMEMMAP=y
141+
CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y
142+
CONFIG_SYNC_FILE=y
143+
CONFIG_SYSCTL_EXCEPTION_TRACE=y
144+
CONFIG_THREAD_INFO_IN_TASK=y
145+
CONFIG_UNMAP_KERNEL_AT_EL0=y
146+
CONFIG_VEXPRESS_CONFIG=y
147+
CONFIG_VIDEOMODE_HELPERS=y
148+
CONFIG_VIRTIO_DMA_SHARED_BUFFER=y
149+
CONFIG_VMAP_STACK=y
150+
CONFIG_ZONE_DMA32=y

‎target/linux/armvirt/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ BOARDNAME:=QEMU ARM Virtual Machine
99
FEATURES:=fpu pci rtc usb
1010
FEATURES+=cpiogz ext4 ramdisk squashfs targz
1111

12-
KERNEL_PATCHVER:=5.4
13-
KERNEL_TESTING_PATCHVER:=5.10
12+
KERNEL_PATCHVER:=5.10
13+
KERNEL_TESTING_PATCHVER:=5.15
1414

1515
include $(INCLUDE_DIR)/target.mk
1616

‎target/linux/armvirt/config-5.10

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ CONFIG_GENERIC_BUG=y
5757
CONFIG_GENERIC_CLOCKEVENTS=y
5858
CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y
5959
CONFIG_GENERIC_CPU_AUTOPROBE=y
60+
CONFIG_GENERIC_CPU_VULNERABILITIES=y
6061
CONFIG_GENERIC_EARLY_IOREMAP=y
6162
CONFIG_GENERIC_GETTIMEOFDAY=y
6263
CONFIG_GENERIC_IDLE_POLL_SETUP=y
@@ -158,6 +159,7 @@ CONFIG_VIRTIO_BALLOON=y
158159
CONFIG_VIRTIO_BLK=y
159160
CONFIG_VIRTIO_CONSOLE=y
160161
CONFIG_VIRTIO_MMIO=y
162+
CONFIG_VIRTIO_MMIO_CMDLINE_DEVICES=y
161163
CONFIG_VIRTIO_NET=y
162164
CONFIG_VIRTIO_PCI=y
163165
CONFIG_VIRTIO_PCI_LEGACY=y

0 commit comments

Comments
 (0)