Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752762AbcLGMTZ (ORCPT ); Wed, 7 Dec 2016 07:19:25 -0500 Received: from mail-pg0-f42.google.com ([74.125.83.42]:34031 "EHLO mail-pg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751905AbcLGMTX (ORCPT ); Wed, 7 Dec 2016 07:19:23 -0500 From: Amit Pundir To: Andrew Morton Cc: Rob Herring , John Stultz , Android Kernel Team , lkml Subject: [PATCH 2/2] config: android-base: enable hardened usercopy and kernel ASLR Date: Wed, 7 Dec 2016 17:49:08 +0530 Message-Id: <1481113148-29204-2-git-send-email-amit.pundir@linaro.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1481113148-29204-1-git-send-email-amit.pundir@linaro.org> References: <1481113148-29204-1-git-send-email-amit.pundir@linaro.org> Author: Amit Pundir Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 955 Lines: 33 Enable CONFIG_HARDENED_USERCOPY and CONFIG_RANDOMIZE_BASE in Android base config fragment. Reviewed-at: https://android-review.googlesource.com/#/c/283659/ Reviewed-at: https://android-review.googlesource.com/#/c/278133/ Signed-off-by: Amit Pundir --- kernel/configs/android-base.config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/configs/android-base.config b/kernel/configs/android-base.config index 1a8f34f..26a06e0 100644 --- a/kernel/configs/android-base.config +++ b/kernel/configs/android-base.config @@ -21,6 +21,7 @@ CONFIG_CP15_BARRIER_EMULATION=y CONFIG_DEFAULT_SECURITY_SELINUX=y CONFIG_EMBEDDED=y CONFIG_FB=y +CONFIG_HARDENED_USERCOPY=y CONFIG_HIGH_RES_TIMERS=y CONFIG_INET6_AH=y CONFIG_INET6_ESP=y @@ -129,6 +130,7 @@ CONFIG_PPP_DEFLATE=y CONFIG_PPP_MPPE=y CONFIG_PREEMPT=y CONFIG_QUOTA=y +CONFIG_RANDOMIZE_BASE=y CONFIG_RTC_CLASS=y CONFIG_RT_GROUP_SCHED=y CONFIG_SECCOMP=y -- 2.7.4