Skip to contentSkip to conversation

{linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.1.x series

PATCH New Peter Korsgaard 1 participant 8 messages Jun 18, 2019 – Jun 20, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/4 {linux, linux-headers}: bump 4.{4, 9, 14, 19}.x / 5.1.x series

Includes fixes for the "TCP SACK PANIC" vulnerability:

https://access.redhat.com/security/vulnerabilities/tcpsack

---
 linux/Config.in                      |  2 +-
 linux/linux.hash                     | 10 +++++-----
 package/linux-headers/Config.in.host | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)
linux/Config.in +1 -1
index 95ee1cf542..0bc9612551 100644
@@ -121,7 +121,7 @@ endif
 
 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "5.1.10" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "5.1.11" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "v4.19.13-cip1" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
 		if BR2_LINUX_KERNEL_CUSTOM_VERSION
linux/linux.hash +5 -5
index 6477991daa..497e8e4d6f 100644
@@ -1,8 +1,8 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256 39063041532579cb7e9fab5837313a8e6639c1c583cd39c72b313b3abfa9fbcf  linux-5.1.10.tar.xz
+sha256 11fd93207290272389ad284b8b042041d088fbee0ed5798e933bf8e91697d219  linux-5.1.11.tar.xz
 sha256 98d307a546c95a215dee675ffa4b63c2a7a29e7af839f0d8dfb96dbb61aac2d7  linux-5.0.21.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256 7afa920d776f8ca3fc3ced5026cc02c5ccc960c58314050982c307589b5a8d70  linux-4.19.51.tar.xz
-sha256 6a2e89504d8560b132ab743a0206ffce026bff2697b705819421c5f125633970  linux-4.14.126.tar.xz
-sha256 8fcd223e11cba322801bc38cdb8b581d64c0115f585dcb6604de8561b574fced  linux-4.9.181.tar.xz
-sha256 b2ab69813192d49b1b7f89257a3319ef3fd73a54f441f3296d68b744b1c681d3  linux-4.4.181.tar.xz
+sha256 266ee655620c3689ae94761970d6827fffc919760caf815427ad22730ba4381e  linux-4.19.52.tar.xz
+sha256 d7464c2379cdee46548ae9f848671f4669d4003af4034f3f738f2f0511ec75b3  linux-4.14.127.tar.xz
+sha256 b16e12681a0638368479d73a9b1b8e9407c1ae4b7ae52fdf236d9e5657999695  linux-4.9.182.tar.xz
+sha256 c409d88f61cd9a37cbba36d5d9c8162263eb1e5c9380efaf880a3ec10cd88527  linux-4.4.182.tar.xz
package/linux-headers/Config.in.host +5 -5
index eb957b4f12..38ee0a6ac2 100644
@@ -301,12 +301,12 @@ endchoice
 
 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "4.4.181"	if BR2_KERNEL_HEADERS_4_4
-	default "4.9.181"	if BR2_KERNEL_HEADERS_4_9
-	default "4.14.126"	if BR2_KERNEL_HEADERS_4_14
-	default "4.19.51"	if BR2_KERNEL_HEADERS_4_19
+	default "4.4.182"	if BR2_KERNEL_HEADERS_4_4
+	default "4.9.182"	if BR2_KERNEL_HEADERS_4_9
+	default "4.14.127"	if BR2_KERNEL_HEADERS_4_14
+	default "4.19.52"	if BR2_KERNEL_HEADERS_4_19
 	default "5.0.21"	if BR2_KERNEL_HEADERS_5_0
-	default "5.1.10"	if BR2_KERNEL_HEADERS_5_1
+	default "5.1.11"	if BR2_KERNEL_HEADERS_5_1
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
 	default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
Signature · 1 line
2.11.0
#2 lore raw

PATCH 2/4 Config.in.legacy: add legacy entry for 4.20.x headers

In reply to Peter Korsgaard

Commit b3bba8e4254 (package/linux-headers: drop support 4.20 headers) removed the option for 4.20.x kernel headers, but forgot to add a legacy option. Add that now.

---
 Config.in.legacy | 7 +++++++
 1 file changed, 7 insertions(+)
Config.in.legacy +7 -0
index 75d6c723a9..2b8dc3b1ee 100644
@@ -153,6 +153,13 @@ config BR2_GDB_VERSION_8_0
 	  The 8.0.x version of gdb has been removed. Use a newer
 	  version instead.
 
+config BR2_KERNEL_HEADERS_4_20
+	bool "kernel headers version 4.20.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 4.20.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
 comment "Legacy options removed in 2019.05"
 
 config BR2_CSKY_DSP
Signature · 1 line
2.11.0
#3 lore raw

PATCH 2/4 Config.in.legacy: add legacy entry for 4.20.x headers

Quoted 7 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Commit b3bba8e4254 (package/linux-headers: drop support 4.20 headers) removed the option for 4.20.x kernel headers, but forgot to add a legacy option. Add that now.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#4 lore raw

PATCH 3/4 amarula_vyasa_rk3288_defconfig: use same-as-kernel option for kernel headers

In reply to Peter Korsgaard

Instead of the to-be-removed 5.0 option.

---
 configs/amarula_vyasa_rk3288_defconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
configs/amarula_vyasa_rk3288_defconfig +1 -1
index 6fd46b6455..760ad3f9f4 100644
@@ -4,7 +4,7 @@ BR2_cortex_a17=y
 BR2_ARM_FPU_NEON_VFPV4=y
 
 # Linux headers same as kernel, a 5.0 series
-BR2_KERNEL_HEADERS_5_0=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y
 
 # Bootloader
 BR2_TARGET_UBOOT=y
Signature · 1 line
2.11.0
#5 lore raw

PATCH 3/4 amarula_vyasa_rk3288_defconfig: use same-as-kernel option for kernel headers

Quoted 4 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

Instead of the to-be-removed 5.0 option.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard
#6 lore raw

PATCH 4/4 package/linux-headers: drop support for 5.x headers

In reply to Peter Korsgaard

The 5.0.x series is now EOL and vulnerable to the "TCP SACK PANIC" issue. Drop support for it in linux-headers.

---
 Config.in.legacy                     | 7 +++++++
 linux/linux.hash                     | 1 -
 package/linux-headers/Config.in.host | 5 -----
 3 files changed, 7 insertions(+), 6 deletions(-)
Config.in.legacy +7 -0
index 2b8dc3b1ee..9d54026899 100644
@@ -160,6 +160,13 @@ config BR2_KERNEL_HEADERS_4_20
 	  Version 4.20.x of the Linux kernel headers are no longer
 	  maintained upstream and are now removed.
 
+config BR2_KERNEL_HEADERS_5_0
+	bool "kernel headers version 5.0.x are no longer supported"
+	select BR2_LEGACY
+	help
+	  Version 5.0.x of the Linux kernel headers are no longer
+	  maintained upstream and are now removed.
+
 comment "Legacy options removed in 2019.05"
 
 config BR2_CSKY_DSP
linux/linux.hash +0 -1
index 497e8e4d6f..205441dc25 100644
@@ -1,6 +1,5 @@
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
 sha256 11fd93207290272389ad284b8b042041d088fbee0ed5798e933bf8e91697d219  linux-5.1.11.tar.xz
-sha256 98d307a546c95a215dee675ffa4b63c2a7a29e7af839f0d8dfb96dbb61aac2d7  linux-5.0.21.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
 sha256 266ee655620c3689ae94761970d6827fffc919760caf815427ad22730ba4381e  linux-4.19.52.tar.xz
 sha256 d7464c2379cdee46548ae9f848671f4669d4003af4034f3f738f2f0511ec75b3  linux-4.14.127.tar.xz
package/linux-headers/Config.in.host +0 -5
index 38ee0a6ac2..adf342fce0 100644
@@ -49,10 +49,6 @@ config BR2_KERNEL_HEADERS_4_19
 	depends on !BR2_csky
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_4_19
 
-config BR2_KERNEL_HEADERS_5_0
-	bool "Linux 5.0.x kernel headers"
-	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_0
-
 config BR2_KERNEL_HEADERS_5_1
 	bool "Linux 5.1.x kernel headers"
 	select BR2_TOOLCHAIN_HEADERS_AT_LEAST_5_1
@@ -305,7 +301,6 @@ config BR2_DEFAULT_KERNEL_HEADERS
 	default "4.9.182"	if BR2_KERNEL_HEADERS_4_9
 	default "4.14.127"	if BR2_KERNEL_HEADERS_4_14
 	default "4.19.52"	if BR2_KERNEL_HEADERS_4_19
-	default "5.0.21"	if BR2_KERNEL_HEADERS_5_0
 	default "5.1.11"	if BR2_KERNEL_HEADERS_5_1
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
Signature · 1 line
2.11.0
#7 lore raw

PATCH 4/4 package/linux-headers: drop support for 5.x headers

Quoted 6 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Peter" == Peter Korsgaard <[email protected]> writes:

The 5.0.x series is now EOL and vulnerable to the "TCP SACK PANIC" issue. Drop support for it in linux-headers.

Committed, thanks.

Signature · 1 line
Bye, Peter Korsgaard