drop 2 5.10 patches

diff --git a/queue-5.10/kasan-add-explicit-preconditions-to-kasan_report.patch b/queue-5.10/kasan-add-explicit-preconditions-to-kasan_report.patch
deleted file mode 100644 (file)
index c806ae6..0000000
--- a/queue-5.10/kasan-add-explicit-preconditions-to-kasan_report.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From ba00b65f4d2594a85a18eb19e8e9ad6c6f7aef56 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 4 Feb 2021 18:32:49 -0800
-Subject: kasan: add explicit preconditions to kasan_report()
-
-From: Vincenzo Frascino <vincenzo.frascino@arm.com>
-
-[ Upstream commit 49c6631d3b4f61a7b5bb0453a885a12bfa06ffd8 ]
-
-Patch series "kasan: Fix metadata detection for KASAN_HW_TAGS", v5.
-
-With the introduction of KASAN_HW_TAGS, kasan_report() currently assumes
-that every location in memory has valid metadata associated.  This is
-due to the fact that addr_has_metadata() returns always true.
-
-As a consequence of this, an invalid address (e.g.  NULL pointer
-address) passed to kasan_report() when KASAN_HW_TAGS is enabled, leads
-to a kernel panic.
-
-Example below, based on arm64:
-
-   BUG: KASAN: invalid-access in 0x0
-   Read at addr 0000000000000000 by task swapper/0/1
-   Unable to handle kernel NULL pointer dereference at virtual address 0000000000000000
-   Mem abort info:
-     ESR = 0x96000004
-     EC = 0x25: DABT (current EL), IL = 32 bits
-     SET = 0, FnV = 0
-     EA = 0, S1PTW = 0
-   Data abort info:
-     ISV = 0, ISS = 0x00000004
-     CM = 0, WnR = 0
-
-  ...
-
-   Call trace:
-    mte_get_mem_tag+0x24/0x40
-    kasan_report+0x1a4/0x410
-    alsa_sound_last_init+0x8c/0xa4
-    do_one_initcall+0x50/0x1b0
-    kernel_init_freeable+0x1d4/0x23c
-    kernel_init+0x14/0x118
-    ret_from_fork+0x10/0x34
-   Code: d65f03c0 9000f021 f9428021 b6cfff61 (d9600000)
-   ---[ end trace 377c8bb45bdd3a1a ]---
-   hrtimer: interrupt took 48694256 ns
-   note: swapper/0[1] exited with preempt_count 1
-   Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b
-   SMP: stopping secondary CPUs
-   Kernel Offset: 0x35abaf140000 from 0xffff800010000000
-   PHYS_OFFSET: 0x40000000
-   CPU features: 0x0a7e0152,61c0a030
-   Memory Limit: none
-   ---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b ]---
-
-This series fixes the behavior of addr_has_metadata() that now returns
-true only when the address is valid.
-
-This patch (of 2):
-
-With the introduction of KASAN_HW_TAGS, kasan_report() accesses the
-metadata only when addr_has_metadata() succeeds.
-
-Add a comment to make sure that the preconditions to the function are
-explicitly clarified.
-
-Link: https://lkml.kernel.org/r/20210126134409.47894-1-vincenzo.frascino@arm.com
-Link: https://lkml.kernel.org/r/20210126134409.47894-2-vincenzo.frascino@arm.com
-Signed-off-by: Vincenzo Frascino <vincenzo.frascino@arm.com>
-Reviewed-by: Andrey Konovalov <andreyknvl@google.com>
-Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
-Cc: Alexander Potapenko <glider@google.com>
-Cc: Dmitry Vyukov <dvyukov@google.com>
-Cc: Leon Romanovsky <leonro@mellanox.com>
-Cc: Andrey Konovalov <andreyknvl@google.com>
-Cc: Catalin Marinas <catalin.marinas@arm.com>
-Cc: Will Deacon <will@kernel.org>
-Cc: Mark Rutland <mark.rutland@arm.com>
-Cc: "Paul E . McKenney" <paulmck@kernel.org>
-Cc: Naresh Kamboju <naresh.kamboju@linaro.org>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- include/linux/kasan.h | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/include/linux/kasan.h b/include/linux/kasan.h
-index 30d343b4a40a5..646fa165d2cce 100644
---- a/include/linux/kasan.h
-+++ b/include/linux/kasan.h
-@@ -196,6 +196,13 @@ void kasan_init_tags(void);
- 
- void *kasan_reset_tag(const void *addr);
- 
-+/**
-+ * kasan_report - print a report about a bad memory access detected by KASAN
-+ * @addr: address of the bad access
-+ * @size: size of the bad access
-+ * @is_write: whether the bad access is a write or a read
-+ * @ip: instruction pointer for the accessibility check or the bad access itself
-+ */
- bool kasan_report(unsigned long addr, size_t size,
-               bool is_write, unsigned long ip);
- 
--- 
-2.27.0
-

diff --git a/queue-5.10/kbuild-simplify-gcc_plugins-enablement-in-dummy-tool.patch b/queue-5.10/kbuild-simplify-gcc_plugins-enablement-in-dummy-tool.patch
deleted file mode 100644 (file)
index 5f38352..0000000
--- a/queue-5.10/kbuild-simplify-gcc_plugins-enablement-in-dummy-tool.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 54ba516fc3f6a2f561b1eb20522b79bf3385388c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Sat, 23 Jan 2021 18:16:30 +0900
-Subject: kbuild: simplify GCC_PLUGINS enablement in dummy-tools/gcc
-
-From: Masahiro Yamada <masahiroy@kernel.org>
-
-[ Upstream commit f4c3b83b75b91c5059726cb91e3165cc01764ce7 ]
-
-With commit 1e860048c53e ("gcc-plugins: simplify GCC plugin-dev
-capability test") applied, this hunk can be way simplified because
-now scripts/gcc-plugins/Kconfig only checks plugin-version.h
-
-Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- scripts/dummy-tools/gcc | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/scripts/dummy-tools/gcc b/scripts/dummy-tools/gcc
-index 33487e99d83e5..5c113cad56017 100755
---- a/scripts/dummy-tools/gcc
-+++ b/scripts/dummy-tools/gcc
-@@ -75,16 +75,12 @@ if arg_contain -S "$@"; then
-       fi
- fi
- 
--# For scripts/gcc-plugin.sh
-+# To set GCC_PLUGINS
- if arg_contain -print-file-name=plugin "$@"; then
-       plugin_dir=$(mktemp -d)
- 
--      sed -n 's/.*#include "\(.*\)"/\1/p' $(dirname $0)/../gcc-plugins/gcc-common.h |
--      while read header
--      do
--              mkdir -p $plugin_dir/include/$(dirname $header)
--              touch $plugin_dir/include/$header
--      done
-+      mkdir -p $plugin_dir/include
-+      touch $plugin_dir/include/plugin-version.h
- 
-       echo $plugin_dir
-       exit 0
--- 
-2.27.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index 64aa1927ead22b32d44a172f706583426f114e81..71027dcbcde0cf0b6994268cbf78e6749a34d14a 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -19,7 +19,6 @@ arm64-dts-rockchip-fix-pcie-dt-properties-on-rk3399.patch
 arm64-dts-qcom-sdm845-reserve-lpass-clocks-in-gcc.patch
 arm-omap2-fix-suspcious-rcu-usage-splats-for-omap_en.patch
 arm64-dts-rockchip-remove-interrupt-names-property-f.patch
-kbuild-simplify-gcc_plugins-enablement-in-dummy-tool.patch
 platform-x86-hp-wmi-disable-tablet-mode-reporting-by.patch
 arm64-dts-rockchip-disable-display-for-nanopi-r2s.patch
 ovl-perform-vfs_getxattr-with-mounter-creds.patch
@@ -40,7 +39,6 @@ arm-dts-lpc32xx-revert-set-default-clock-rate-of-hcl.patch
 kallsyms-fix-nonconverging-kallsyms-table-with-lld.patch
 arm-ensure-the-signal-page-contains-defined-contents.patch
 arm-kexec-fix-oops-after-tlb-are-invalidated.patch
-kasan-add-explicit-preconditions-to-kasan_report.patch
 ubsan-implement-__ubsan_handle_alignment_assumption.patch
 revert-lib-restrict-cpumask_local_spread-to-houskeep.patch
 x86-efi-remove-efi-pgd-build-time-checks.patch