* [PATCH] ARM: domains: Extract common USER domain init
@ 2017-04-06 4:00 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2017-04-06 4:00 UTC (permalink / raw)
To: linux-kernel; +Cc: Russell King, Vladimir Murzin, linux-arm-kernel
Everything but the USER domain is the same with CONFIG_CPU_SW_DOMAIN_PAN
or not. This extracts the differences for a common DACR_INIT macro so it
is easier to make future changes (like adding the WR_RARE domain).
Signed-off-by: Kees Cook <keescook@chromium.org>
---
arch/arm/include/asm/domain.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
index 99d9f630d6b6..8b33bd7f6bf9 100644
--- a/arch/arm/include/asm/domain.h
+++ b/arch/arm/include/asm/domain.h
@@ -59,18 +59,18 @@
#define domain_val(dom,type) ((type) << (2 * (dom)))
#ifdef CONFIG_CPU_SW_DOMAIN_PAN
-#define DACR_INIT \
- (domain_val(DOMAIN_USER, DOMAIN_NOACCESS) | \
- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
- domain_val(DOMAIN_IO, DOMAIN_CLIENT) | \
- domain_val(DOMAIN_VECTORS, DOMAIN_CLIENT))
+#define __DACR_INIT_USER \
+ domain_val(DOMAIN_USER, DOMAIN_NOACCESS)
#else
+#define __DACR_INIT_USER \
+ domain_val(DOMAIN_USER, DOMAIN_CLIENT)
+#endif
+
#define DACR_INIT \
- (domain_val(DOMAIN_USER, DOMAIN_CLIENT) | \
+ (__DACR_INIT_USER | \
domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
domain_val(DOMAIN_IO, DOMAIN_CLIENT) | \
domain_val(DOMAIN_VECTORS, DOMAIN_CLIENT))
-#endif
#define __DACR_DEFAULT \
domain_val(DOMAIN_KERNEL, DOMAIN_CLIENT) | \
--
2.7.4
--
Kees Cook
Pixel Security
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH] ARM: domains: Extract common USER domain init
@ 2017-04-06 4:00 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2017-04-06 4:00 UTC (permalink / raw)
To: linux-arm-kernel
Everything but the USER domain is the same with CONFIG_CPU_SW_DOMAIN_PAN
or not. This extracts the differences for a common DACR_INIT macro so it
is easier to make future changes (like adding the WR_RARE domain).
Signed-off-by: Kees Cook <keescook@chromium.org>
---
arch/arm/include/asm/domain.h | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/arch/arm/include/asm/domain.h b/arch/arm/include/asm/domain.h
index 99d9f630d6b6..8b33bd7f6bf9 100644
--- a/arch/arm/include/asm/domain.h
+++ b/arch/arm/include/asm/domain.h
@@ -59,18 +59,18 @@
#define domain_val(dom,type) ((type) << (2 * (dom)))
#ifdef CONFIG_CPU_SW_DOMAIN_PAN
-#define DACR_INIT \
- (domain_val(DOMAIN_USER, DOMAIN_NOACCESS) | \
- domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
- domain_val(DOMAIN_IO, DOMAIN_CLIENT) | \
- domain_val(DOMAIN_VECTORS, DOMAIN_CLIENT))
+#define __DACR_INIT_USER \
+ domain_val(DOMAIN_USER, DOMAIN_NOACCESS)
#else
+#define __DACR_INIT_USER \
+ domain_val(DOMAIN_USER, DOMAIN_CLIENT)
+#endif
+
#define DACR_INIT \
- (domain_val(DOMAIN_USER, DOMAIN_CLIENT) | \
+ (__DACR_INIT_USER | \
domain_val(DOMAIN_KERNEL, DOMAIN_MANAGER) | \
domain_val(DOMAIN_IO, DOMAIN_CLIENT) | \
domain_val(DOMAIN_VECTORS, DOMAIN_CLIENT))
-#endif
#define __DACR_DEFAULT \
domain_val(DOMAIN_KERNEL, DOMAIN_CLIENT) | \
--
2.7.4
--
Kees Cook
Pixel Security
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-04-06 4:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-06 4:00 [PATCH] ARM: domains: Extract common USER domain init Kees Cook
2017-04-06 4:00 ` Kees Cook
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.