From 536f051b971c8b3aada21c35ca7deefb94e7dd74 Mon Sep 17 00:00:00 2001 From: Rui Salvaterra Date: Wed, 5 Jan 2022 13:27:56 +0000 Subject: kernel: bump 5.10 to 5.10.90 Add and enable a new kconfig knob to disable unprivileged eBPF by default. Patches automatically rebased. Signed-off-by: Rui Salvaterra --- ...32-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch | 2 +- target/linux/generic/config-5.10 | 1 + target/linux/generic/hack-5.10/204-module_strip.patch | 2 +- target/linux/generic/pending-5.10/920-mangle_bootargs.patch | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) (limited to 'target/linux/generic') diff --git a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch index 696892786e..65619e0837 100644 --- a/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch +++ b/target/linux/generic/backport-5.10/732-net-next-1-of-net-pass-the-dst-buffer-to-of_get_mac_address.patch @@ -319,7 +319,7 @@ Signed-off-by: David S. Miller int tx_size, err, i; struct ag71xx *ag; -@@ -1957,10 +1956,8 @@ static int ag71xx_probe(struct platform_ +@@ -1952,10 +1951,8 @@ static int ag71xx_probe(struct platform_ ag->stop_desc->ctrl = 0; ag->stop_desc->next = (u32)ag->stop_desc_dma; diff --git a/target/linux/generic/config-5.10 b/target/linux/generic/config-5.10 index c37e33b13d..bd2e72e54f 100644 --- a/target/linux/generic/config-5.10 +++ b/target/linux/generic/config-5.10 @@ -705,6 +705,7 @@ CONFIG_BPF_JIT_DEFAULT_ON=y # CONFIG_BPF_PRELOAD is not set # CONFIG_BPF_STREAM_PARSER is not set CONFIG_BPF_SYSCALL=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y # CONFIG_BPQETHER is not set CONFIG_BQL=y CONFIG_BRANCH_PROFILE_NONE=y diff --git a/target/linux/generic/hack-5.10/204-module_strip.patch b/target/linux/generic/hack-5.10/204-module_strip.patch index f372687ba1..645074821f 100644 --- a/target/linux/generic/hack-5.10/204-module_strip.patch +++ b/target/linux/generic/hack-5.10/204-module_strip.patch @@ -88,7 +88,7 @@ Signed-off-by: Felix Fietkau --- a/init/Kconfig +++ b/init/Kconfig -@@ -2337,6 +2337,13 @@ config UNUSED_KSYMS_WHITELIST +@@ -2347,6 +2347,13 @@ config UNUSED_KSYMS_WHITELIST one per line. The path can be absolute, or relative to the kernel source tree. diff --git a/target/linux/generic/pending-5.10/920-mangle_bootargs.patch b/target/linux/generic/pending-5.10/920-mangle_bootargs.patch index d8f5c06b7e..fc64a4205e 100644 --- a/target/linux/generic/pending-5.10/920-mangle_bootargs.patch +++ b/target/linux/generic/pending-5.10/920-mangle_bootargs.patch @@ -13,7 +13,7 @@ Signed-off-by: Imre Kaloz --- a/init/Kconfig +++ b/init/Kconfig -@@ -1790,6 +1790,15 @@ config EMBEDDED +@@ -1800,6 +1800,15 @@ config EMBEDDED an embedded system so certain expert options are available for configuration. -- cgit v1.2.3