Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1479447 > unrolled thread

[PATCH 1/3] config: android: move device mapper options to recommended

Started byRob Herring <robh@kernel.org>
First post2016-09-08 21:00 +0200
Last post2016-09-08 21:10 +0200
Articles 5 — 2 participants

Back to article view | Back to linux.kernel


Contents

  [PATCH 1/3] config: android: move device mapper options to recommended Rob Herring <robh@kernel.org> - 2016-09-08 21:00 +0200
    [PATCH 3/3] config: android: enable CONFIG_SECCOMP Rob Herring <robh@kernel.org> - 2016-09-08 21:00 +0200
      Re: [PATCH 3/3] config: android: enable CONFIG_SECCOMP John Stultz <john.stultz@linaro.org> - 2016-09-08 21:10 +0200
    Re: [PATCH 1/3] config: android: move device mapper options to recommended John Stultz <john.stultz@linaro.org> - 2016-09-08 21:10 +0200
    [PATCH 2/3] config: android: set SELinux as default security mode Rob Herring <robh@kernel.org> - 2016-09-08 21:10 +0200

#1479447 — [PATCH 1/3] config: android: move device mapper options to recommended

FromRob Herring <robh@kernel.org>
Date2016-09-08 21:00 +0200
Subject[PATCH 1/3] config: android: move device mapper options to recommended
Message-ID<sfcIh-11C-13@gated-at.bofh.it>
CONFIG_MD is in recommended, but other dependent options like DM_CRYPT
and DM_VERITY options are in base. The result is the options in base don't
get enabled when applying both base and recommended fragments. Move all
the options to recommended.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 kernel/configs/android-base.config        | 4 ----
 kernel/configs/android-recommended.config | 4 ++++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config
index 9f748ed..19eb7ac 100644
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -11,7 +11,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y
 CONFIG_ARMV8_DEPRECATED=y
 CONFIG_ASHMEM=y
 CONFIG_AUDIT=y
-CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_CPUACCT=y
@@ -19,9 +18,6 @@ CONFIG_CGROUP_DEBUG=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CP15_BARRIER_EMULATION=y
-CONFIG_DM_CRYPT=y
-CONFIG_DM_VERITY=y
-CONFIG_DM_VERITY_FEC=y
 CONFIG_EMBEDDED=y
 CONFIG_FB=y
 CONFIG_HIGH_RES_TIMERS=y
diff --git a/kernel/configs/android-recommended.config b/kernel/configs/android-recommended.config
index e3b953e..297756b 100644
--- a/kernel/configs/android-recommended.config
+++ b/kernel/configs/android-recommended.config
@@ -6,12 +6,16 @@
 # CONFIG_PM_WAKELOCKS_GC is not set
 # CONFIG_VT is not set
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
+CONFIG_BLK_DEV_DM=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=8192
 CONFIG_COMPACTION=y
 CONFIG_DEBUG_RODATA=y
+CONFIG_DM_CRYPT=y
 CONFIG_DM_UEVENT=y
+CONFIG_DM_VERITY=y
+CONFIG_DM_VERITY_FEC=y
 CONFIG_DRAGONRISE_FF=y
 CONFIG_ENABLE_DEFAULT_TRACERS=y
 CONFIG_EXT4_FS=y
-- 
2.9.3

[toc] | [next] | [standalone]


#1479448 — [PATCH 3/3] config: android: enable CONFIG_SECCOMP

FromRob Herring <robh@kernel.org>
Date2016-09-08 21:00 +0200
Subject[PATCH 3/3] config: android: enable CONFIG_SECCOMP
Message-ID<sfcIh-11C-11@gated-at.bofh.it>
In reply to#1479447
As of Android N, SECCOMP is required. Without it, we will get
mediaextractor error:

E /system/bin/mediaextractor: libminijail: prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER): Invalid argument

Signed-off-by: Rob Herring <robh@kernel.org>
---
 kernel/configs/android-base.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config
index 859fa27..980e72d 100644
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -132,6 +132,7 @@ CONFIG_PREEMPT=y
 CONFIG_QUOTA=y
 CONFIG_RTC_CLASS=y
 CONFIG_RT_GROUP_SCHED=y
+CONFIG_SECCOMP=y
 CONFIG_SECURITY=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_SECURITY_SELINUX=y
-- 
2.9.3

[toc] | [prev] | [next] | [standalone]


#1479455 — Re: [PATCH 3/3] config: android: enable CONFIG_SECCOMP

FromJohn Stultz <john.stultz@linaro.org>
Date2016-09-08 21:10 +0200
SubjectRe: [PATCH 3/3] config: android: enable CONFIG_SECCOMP
Message-ID<sfcRY-1jO-25@gated-at.bofh.it>
In reply to#1479448
On Thu, Sep 8, 2016 at 11:59 AM, Rob Herring <robh@kernel.org> wrote:
> As of Android N, SECCOMP is required. Without it, we will get
> mediaextractor error:
>
> E /system/bin/mediaextractor: libminijail: prctl(PR_SET_SECCOMP, SECCOMP_MODE_FILTER): Invalid argument
>
> Signed-off-by: Rob Herring <robh@kernel.org>

Acked-by: John Stultz <john.stultz@linaro.org>

thanks
-john

[toc] | [prev] | [next] | [standalone]


#1479450

FromJohn Stultz <john.stultz@linaro.org>
Date2016-09-08 21:10 +0200
Message-ID<sfcRY-1jO-5@gated-at.bofh.it>
In reply to#1479447
On Thu, Sep 8, 2016 at 11:59 AM, Rob Herring <robh@kernel.org> wrote:
> CONFIG_MD is in recommended, but other dependent options like DM_CRYPT
> and DM_VERITY options are in base. The result is the options in base don't
> get enabled when applying both base and recommended fragments. Move all
> the options to recommended.
>
> Signed-off-by: Rob Herring <robh@kernel.org>

Acked-by: John Stultz <john.stultz@linaro.org>

thanks
-john

[toc] | [prev] | [next] | [standalone]


#1479452 — [PATCH 2/3] config: android: set SELinux as default security mode

FromRob Herring <robh@kernel.org>
Date2016-09-08 21:10 +0200
Subject[PATCH 2/3] config: android: set SELinux as default security mode
Message-ID<sfcRX-1jO-1@gated-at.bofh.it>
In reply to#1479447
Android won't boot without SELinux enabled, so make it the default.

Signed-off-by: Rob Herring <robh@kernel.org>
---
 kernel/configs/android-base.config | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config
index 19eb7ac..859fa27 100644
--- a/kernel/configs/android-base.config
+++ b/kernel/configs/android-base.config
@@ -18,6 +18,7 @@ CONFIG_CGROUP_DEBUG=y
 CONFIG_CGROUP_FREEZER=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_CP15_BARRIER_EMULATION=y
+CONFIG_DEFAULT_SECURITY_SELINUX=y
 CONFIG_EMBEDDED=y
 CONFIG_FB=y
 CONFIG_HIGH_RES_TIMERS=y
-- 
2.9.3

[toc] | [prev] | [standalone]


Back to top | Article view | linux.kernel


csiph-web