linux-kernel - [PATCH 2/6] Disable instrumentation for some code

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180412125411.326-3-liuwenliang@huawei.com>
Date:   Thu, 12 Apr 2018 20:54:07 +0800
From:   Abbott Liu <liuwenliang@...wei.com>
To:     <aryabinin@...tuozzo.com>, <glider@...gle.com>,
        <dvyukov@...gle.com>, <corbet@....net>, <linux@...linux.org.uk>,
        <cdall@...nel.org>, <marc.zyngier@....com>, <arnd@...db.de>,
        <nicolas.pitre@...aro.org>, <vladimir.murzin@....com>,
        <mingo@...nel.org>, <viro@...iv.linux.org.uk>,
        <alexandre.belloni@...tlin.com>, <ard.biesheuvel@...aro.org>,
        <daniel.lezcano@...aro.org>, <pombredanne@...b.com>,
        <kstewart@...uxfoundation.org>, <liuwenliang@...wei.com>,
        <gregkh@...uxfoundation.org>, <f.fainelli@...il.com>,
        <mawilcox@...rosoft.com>, <akpm@...ux-foundation.org>,
        <mark.rutland@....com>, <afzal.mohd.ma@...il.com>,
        <alexander.levin@...izon.com>, <tglx@...utronix.de>,
        <thgarnie@...gle.com>, <dhowells@...hat.com>,
        <keescook@...omium.org>, <geert@...ux-m68k.org>, <tixy@...aro.org>,
        <julien.thierry@....com>, <james.morse@....com>,
        <zhichao.huang@...aro.org>, <jinb.park7@...il.com>,
        <labbott@...hat.com>, <philip@....systems>,
        <grygorii.strashko@...aro.org>, <opendmb@...il.com>,
        <mhocko@...e.com>, <kirill.shutemov@...ux.intel.com>,
        <kasan-dev@...glegroups.com>, <linux-doc@...r.kernel.org>,
        <linux-kernel@...r.kernel.org>,
        <linux-arm-kernel@...ts.infradead.org>,
        <kvmarm@...ts.cs.columbia.edu>
Subject: [PATCH 2/6] Disable instrumentation for some code

From: Andrey Ryabinin <a.ryabinin@...sung.com>

Disable instrumentation for arch/arm/boot/compressed/*
and arch/arm/vdso/* because those code won't linkd with
kernel image.

Disable instrumentation for arch/arm/kvm/hyp/*. See commit a6cdf1c08cbf
("kvm: arm64: Disable compiler instrumentation for hypervisor code")
for more details.

Disable instrumentation for arch/arm/mm/physaddr.c. See
commit ec6d06efb0ba ("arm64: Add support for CONFIG_DEBUG_VIRTUAL")
for more details.

Disable kasan check in the function unwind_pop_register
because it doesn't matter that kasan checks failed when
unwind_pop_register read stack memory of task.

Reported-by: Florian Fainelli <f.fainelli@...il.com>
Reported-by: Marc Zyngier <marc.zyngier@....com>
Tested-by: Joel Stanley <joel@....id.au>
Tested-by: Florian Fainelli <f.fainelli@...il.com>
Tested-by: Abbott Liu <liuwenliang@...wei.com>
Signed-off-by: Abbott Liu <liuwenliang@...wei.com>
---
 arch/arm/boot/compressed/Makefile | 1 +
 arch/arm/kernel/unwind.c          | 3 ++-
 arch/arm/kvm/hyp/Makefile         | 4 ++++
 arch/arm/mm/Makefile              | 1 +
 arch/arm/vdso/Makefile            | 2 ++
 5 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/arch/arm/boot/compressed/Makefile b/arch/arm/boot/compressed/Makefile
index 45a6b9b..966103e 100644
--- a/arch/arm/boot/compressed/Makefile
+++ b/arch/arm/boot/compressed/Makefile
@@ -24,6 +24,7 @@ OBJS		+= hyp-stub.o
 endif
 
 GCOV_PROFILE		:= n
+KASAN_SANITIZE		:= n
 
 #
 # Architecture dependencies
diff --git a/arch/arm/kernel/unwind.c b/arch/arm/kernel/unwind.c
index 0bee233..2e55c7d 100644
--- a/arch/arm/kernel/unwind.c
+++ b/arch/arm/kernel/unwind.c
@@ -249,7 +249,8 @@ static int unwind_pop_register(struct unwind_ctrl_block *ctrl,
 		if (*vsp >= (unsigned long *)ctrl->sp_high)
 			return -URC_FAILURE;
 
-	ctrl->vrs[reg] = *(*vsp)++;
+	ctrl->vrs[reg] = READ_ONCE_NOCHECK(*(*vsp));
+	(*vsp)++;
 	return URC_OK;
 }
 
diff --git a/arch/arm/kvm/hyp/Makefile b/arch/arm/kvm/hyp/Makefile
index 63d6b40..0a8b500 100644
--- a/arch/arm/kvm/hyp/Makefile
+++ b/arch/arm/kvm/hyp/Makefile
@@ -24,3 +24,7 @@ obj-$(CONFIG_KVM_ARM_HOST) += hyp-entry.o
 obj-$(CONFIG_KVM_ARM_HOST) += switch.o
 CFLAGS_switch.o		   += $(CFLAGS_ARMV7VE)
 obj-$(CONFIG_KVM_ARM_HOST) += s2-setup.o
+
+GCOV_PROFILE	:= n
+KASAN_SANITIZE	:= n
+UBSAN_SANITIZE	:= n
diff --git a/arch/arm/mm/Makefile b/arch/arm/mm/Makefile
index 9dbb849..c056e17 100644
--- a/arch/arm/mm/Makefile
+++ b/arch/arm/mm/Makefile
@@ -16,6 +16,7 @@ endif
 obj-$(CONFIG_ARM_PTDUMP_CORE)	+= dump.o
 obj-$(CONFIG_ARM_PTDUMP_DEBUGFS)	+= ptdump_debugfs.o
 obj-$(CONFIG_MODULES)		+= proc-syms.o
+KASAN_SANITIZE_physaddr.o	:= n
 obj-$(CONFIG_DEBUG_VIRTUAL)	+= physaddr.o
 
 obj-$(CONFIG_ALIGNMENT_TRAP)	+= alignment.o
diff --git a/arch/arm/vdso/Makefile b/arch/arm/vdso/Makefile
index bb411821..87abbb7 100644
--- a/arch/arm/vdso/Makefile
+++ b/arch/arm/vdso/Makefile
@@ -30,6 +30,8 @@ CFLAGS_vgettimeofday.o = -O2
 # Disable gcov profiling for VDSO code
 GCOV_PROFILE := n
 
+KASAN_SANITIZE := n
+
 # Force dependency
 $(obj)/vdso.o : $(obj)/vdso.so
 
-- 
2.9.0