From 6a07930a90887240167bca8b6d0b47f76e5ba9ae Mon Sep 17 00:00:00 2001 From: Cheng Jian Date: Tue, 3 Mar 2020 17:52:02 +0800 Subject: [PATCH] livepatch/x86: enable livepatch config for hulk hulk inclusion category: feature bugzilla: 5507 CVE: NA --------------------------- We have completed the livepatch without ftrace for x86_64, we can now enable it. Signed-off-by: Cheng Jian Reviewed-By: Xie XiuQi Signed-off-by: Yang Yingliang --- arch/x86/configs/hulk_defconfig | 8 +++++--- arch/x86/configs/syzkaller_defconfig | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/arch/x86/configs/hulk_defconfig b/arch/x86/configs/hulk_defconfig index 4effeb69653c..6603d48c5528 100644 --- a/arch/x86/configs/hulk_defconfig +++ b/arch/x86/configs/hulk_defconfig @@ -440,9 +440,11 @@ CONFIG_HAVE_LIVEPATCH_FTRACE=y # Enable Livepatch # CONFIG_LIVEPATCH=y -CONFIG_LIVEPATCH_FTRACE=y -CONFIG_LIVEPATCH_PER_TASK_CONSISTENCY=y -CONFIG_LIVEPATCH_STACK=y +# CONFIG_LIVEPATCH_FTRACE is not set +CONFIG_LIVEPATCH_WO_FTRACE=y +CONFIG_LIVEPATCH_STOP_MACHINE_CONSISTENCY=y +# CONFIG_LIVEPATCH_STACK is not set +CONFIG_LIVEPATCH_RESTRICT_KPROBE=y CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y diff --git a/arch/x86/configs/syzkaller_defconfig b/arch/x86/configs/syzkaller_defconfig index d7444f803382..b49b631bcc25 100644 --- a/arch/x86/configs/syzkaller_defconfig +++ b/arch/x86/configs/syzkaller_defconfig @@ -438,9 +438,11 @@ CONFIG_HAVE_LIVEPATCH_FTRACE=y # Enable Livepatch # CONFIG_LIVEPATCH=y -CONFIG_LIVEPATCH_FTRACE=y -CONFIG_LIVEPATCH_PER_TASK_CONSISTENCY=y -CONFIG_LIVEPATCH_STACK=y +# CONFIG_LIVEPATCH_FTRACE is not set +CONFIG_LIVEPATCH_WO_FTRACE=y +CONFIG_LIVEPATCH_STOP_MACHINE_CONSISTENCY=y +# CONFIG_LIVEPATCH_STACK is not set +CONFIG_LIVEPATCH_RESTRICT_KPROBE=y CONFIG_ARCH_HAS_ADD_PAGES=y CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y -- GitLab