From patchwork Thu Jan 18 16:13:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 862999 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3zMpsm5zFHz9s7g; Fri, 19 Jan 2018 03:13:32 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ecCoi-0005KL-8n; Thu, 18 Jan 2018 16:13:28 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1ecCof-0005JV-Re for kernel-team@lists.ubuntu.com; Thu, 18 Jan 2018 16:13:25 +0000 Received: from mail-qt0-f197.google.com ([209.85.216.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1ecCof-0001Dr-Fa for kernel-team@lists.ubuntu.com; Thu, 18 Jan 2018 16:13:25 +0000 Received: by mail-qt0-f197.google.com with SMTP id q63so12150253qtd.12 for ; Thu, 18 Jan 2018 08:13:25 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=R3EQpJKAsZrEoKstqCoj/vy0dvxJCjzPs4XpzukfwDk=; b=J9sjbgKb5AIIdOrnRA+UTDHTtfeMs7ZJ3qXGWr0oMWC6q2lS1nIatcL8YVi1303/JI TZX5XeSLcuTxvi1nAk3Jjemtbls2VTxhRdM7N9t8J0xxDLe20X87KLk36rAFgNV8qP4m A2Rxl2fliSs3MmibVuNbtp5MQ1DPz2N2zFgj4lza+Rqr3hCqflv+BCn89lJDxDTBYR3Z SHxF37t6UEZniV3Ww93UYlNFNwQY5RCI3SD3zYekH3T4D/4zFF+SETmulWQQnzR1dp3K SaDfO5MiUogPjitdRG0mm7gts0ZF45ZKY9OvB/gy3yFBzUBEFZ88heidO6GLyrYfZhIt ndbg== X-Gm-Message-State: AKwxytfvHeKzjZqN2HGLdTy5ZYowJ+dX7rAhFx0cTMwlwP0MS6c4GrFo P6zchW+k2igdjSMfIPJJBbJiP2WSlmlgJIRl1+vHzaMNB12kvfYWSztVrku/MPqCefQntHjyJ3T nP5BoJeItaGA9UQvPm66uTRID30WtgRpc32c9X0N0 X-Received: by 10.55.89.3 with SMTP id n3mr74185qkb.202.1516292004145; Thu, 18 Jan 2018 08:13:24 -0800 (PST) X-Google-Smtp-Source: ACJfBosn2u5SaHIhUbiZXH8/zAT5qOMatYDHbjNDrLkWrsB8Ypa1brOTRpPlAyhIUQM1yYXviXhrVA== X-Received: by 10.55.89.3 with SMTP id n3mr74165qkb.202.1516292003800; Thu, 18 Jan 2018 08:13:23 -0800 (PST) Received: from localhost.localdomain (189-19-115-4.dsl.telesp.net.br. [189.19.115.4]) by smtp.gmail.com with ESMTPSA id d76sm4686791qkb.84.2018.01.18.08.13.21 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jan 2018 08:13:22 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [xenial][PATCH 1/3] UBUNTU: SAUCE: s390: improve cpu alternative handling for gmb and nobp Date: Thu, 18 Jan 2018 14:13:12 -0200 Message-Id: <1516291994-11660-2-git-send-email-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516291994-11660-1-git-send-email-marcelo.cerri@canonical.com> References: <1516291923-11189-1-git-send-email-marcelo.cerri@canonical.com> <1516291994-11660-1-git-send-email-marcelo.cerri@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Martin Schwidefsky CVE-2017-5753 CVE-2017-5715 Signed-off-by: Martin Schwidefsky Signed-off-by: Marcelo Henrique Cerri --- arch/s390/Kconfig | 17 +++++++++++++++++ arch/s390/include/asm/facility.h | 18 ++++++++++++++++++ arch/s390/include/asm/lowcore.h | 3 ++- arch/s390/kernel/alternative.c | 32 +++++++++++++++++++++++++------- arch/s390/kernel/early.c | 5 +++++ arch/s390/kernel/entry.S | 4 ++-- arch/s390/kernel/setup.c | 4 +++- arch/s390/kernel/smp.c | 4 +++- arch/s390/kernel/vmlinux.lds.S | 3 --- 9 files changed, 75 insertions(+), 15 deletions(-) diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig index 3a55f493c7da..1a24a3e96199 100644 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@ -485,6 +485,23 @@ source kernel/Kconfig.preempt source kernel/Kconfig.hz +config KERNEL_NOBP + def_bool n + prompt "Enable modified branch prediction for the kernel by default" + help + If this option is selected the kernel will switch to a modified + branch prediction mode if the firmware interface is available. + The modified branch prediction mode improves the behaviour in + regard to speculative execution. + + With the option enabled the kernel parameter "nobp=0" or "nospec" + can be used to run the kernel in the normal branch prediction mode. + + With the option disabled the modified branch prediction mode is + enabled with the "nobp=1" kernel parameter. + + If unsure, say N. + endmenu menu "Memory setup" diff --git a/arch/s390/include/asm/facility.h b/arch/s390/include/asm/facility.h index b4f99d22ba04..f3e1313c263f 100644 --- a/arch/s390/include/asm/facility.h +++ b/arch/s390/include/asm/facility.h @@ -13,6 +13,24 @@ #define MAX_FACILITY_BIT (256*8) /* stfle_fac_list has 256 bytes */ +static inline void __set_facility(unsigned long nr, void *facilities) +{ + unsigned char *ptr = (unsigned char *) facilities; + + if (nr >= MAX_FACILITY_BIT) + return; + ptr[nr >> 3] |= 0x80 >> (nr & 7); +} + +static inline void __clear_facility(unsigned long nr, void *facilities) +{ + unsigned char *ptr = (unsigned char *) facilities; + + if (nr >= MAX_FACILITY_BIT) + return; + ptr[nr >> 3] &= ~(0x80 >> (nr & 7)); +} + static inline int __test_facility(unsigned long nr, void *facilities) { unsigned char *ptr; diff --git a/arch/s390/include/asm/lowcore.h b/arch/s390/include/asm/lowcore.h index afe1cfebf1a4..2f8809671151 100644 --- a/arch/s390/include/asm/lowcore.h +++ b/arch/s390/include/asm/lowcore.h @@ -170,7 +170,8 @@ struct _lowcore { __u8 pad_0x0e20[0x0f00-0x0e20]; /* 0x0e20 */ /* Extended facility list */ - __u64 stfle_fac_list[32]; /* 0x0f00 */ + __u64 stfle_fac_list[16]; /* 0x0f00 */ + __u64 alt_stfle_fac_list[16]; /* 0x0f80 */ __u8 pad_0x1000[0x11b0-0x1000]; /* 0x1000 */ /* Pointer to vector register save area */ diff --git a/arch/s390/kernel/alternative.c b/arch/s390/kernel/alternative.c index 2281f763a9ff..4e443fe369c9 100644 --- a/arch/s390/kernel/alternative.c +++ b/arch/s390/kernel/alternative.c @@ -14,18 +14,35 @@ static int __init disable_alternative_instructions(char *str) early_param("noaltinstr", disable_alternative_instructions); -extern struct alt_instr __alt_nobp[], __alt_nobp_end[]; -static int __init nobp_setup(char *str) +static int __init nobp_setup_early(char *str) { bool enabled; int rc; rc = strtobool(str, &enabled); - if (!rc && enabled) - apply_alternatives(__alt_nobp, __alt_nobp_end); - return rc; + if (rc) + return rc; + if (enabled && test_facility(82)) + __set_facility(82, S390_lowcore.alt_stfle_fac_list); + else + __clear_facility(82, S390_lowcore.alt_stfle_fac_list); + return 0; +} +early_param("nobp", nobp_setup_early); + +static int __init nospec_setup_early(char *str) +{ + __clear_facility(82, S390_lowcore.alt_stfle_fac_list); + return 0; +} +early_param("nospec", nospec_setup_early); + +static int __init nogmb_setup_early(char *str) +{ + __clear_facility(81, S390_lowcore.alt_stfle_fac_list); + return 0; } -__setup("nobp=", nobp_setup); +early_param("nogmb", nogmb_setup_early); struct brcl_insn { u16 opc; @@ -87,7 +104,8 @@ static void __init_or_module __apply_alternatives(struct alt_instr *start, instr = (u8 *)&a->instr_offset + a->instr_offset; replacement = (u8 *)&a->repl_offset + a->repl_offset; - if (!test_facility(a->facility)) + if (!__test_facility(a->facility, + S390_lowcore.alt_stfle_fac_list)) continue; if (unlikely(a->instrlen % 2 || a->replacementlen % 2)) { diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c index f82bcab0b9c3..6a4ba353b8ad 100644 --- a/arch/s390/kernel/early.c +++ b/arch/s390/kernel/early.c @@ -279,6 +279,11 @@ static noinline __init void setup_facility_list(void) { stfle(S390_lowcore.stfle_fac_list, ARRAY_SIZE(S390_lowcore.stfle_fac_list)); + memcpy(S390_lowcore.alt_stfle_fac_list, + S390_lowcore.stfle_fac_list, + sizeof(S390_lowcore.alt_stfle_fac_list)); + if (!IS_ENABLED(CONFIG_KERNEL_NOBP)) + __clear_facility(82, S390_lowcore.alt_stfle_fac_list); } static __init void detect_diag9c(void) diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index ad97f60b699d..d990ad021124 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S @@ -167,7 +167,7 @@ _PIF_WORK = (_PIF_PER_TRAP) 660: .long 0xb2e8c000 .popsection 661: .long 0x47000000 - .pushsection .altnobp, "a" + .pushsection .altinstructions, "a" .long 661b - . .long 660b - . .word 82 @@ -181,7 +181,7 @@ _PIF_WORK = (_PIF_PER_TRAP) 662: .long 0xb2e8d000 .popsection 663: .long 0x47000000 - .pushsection .altnobp, "a" + .pushsection .altinstructions, "a" .long 663b - . .long 662b - . .word 82 diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 136caf3128f0..e5627d4d910c 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -334,7 +334,9 @@ static void __init setup_lowcore(void) lc->machine_flags = S390_lowcore.machine_flags; lc->stfl_fac_list = S390_lowcore.stfl_fac_list; memcpy(lc->stfle_fac_list, S390_lowcore.stfle_fac_list, - MAX_FACILITY_BIT/8); + sizeof(lc->stfle_fac_list)); + memcpy(lc->alt_stfle_fac_list, S390_lowcore.alt_stfle_fac_list, + sizeof(lc->alt_stfle_fac_list)); if (MACHINE_HAS_VX) lc->vector_save_area_addr = (unsigned long) &lc->vector_save_area; diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c index 5c06014d3bb4..6de44b6bbb0d 100644 --- a/arch/s390/kernel/smp.c +++ b/arch/s390/kernel/smp.c @@ -250,7 +250,9 @@ static void pcpu_prepare_secondary(struct pcpu *pcpu, int cpu) __ctl_store(lc->cregs_save_area, 0, 15); save_access_regs((unsigned int *) lc->access_regs_save_area); memcpy(lc->stfle_fac_list, S390_lowcore.stfle_fac_list, - MAX_FACILITY_BIT/8); + sizeof(lc->stfle_fac_list)); + memcpy(lc->alt_stfle_fac_list, S390_lowcore.alt_stfle_fac_list, + sizeof(lc->alt_stfle_fac_list)); } static void pcpu_attach_task(struct pcpu *pcpu, struct task_struct *tsk) diff --git a/arch/s390/kernel/vmlinux.lds.S b/arch/s390/kernel/vmlinux.lds.S index 5b96276f7b10..bcaa816ade85 100644 --- a/arch/s390/kernel/vmlinux.lds.S +++ b/arch/s390/kernel/vmlinux.lds.S @@ -83,9 +83,6 @@ SECTIONS __alt_instructions = .; *(.altinstructions) __alt_instructions_end = .; - __alt_nobp = .; - *(.altnobp) - __alt_nobp_end = .; } /* From patchwork Thu Jan 18 16:13:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 863000 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3zMpsp0z3Pz9s81; Fri, 19 Jan 2018 03:13:34 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ecCoj-0005L9-Du; Thu, 18 Jan 2018 16:13:29 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1ecCoh-0005K5-Ho for kernel-team@lists.ubuntu.com; Thu, 18 Jan 2018 16:13:27 +0000 Received: from mail-qt0-f199.google.com ([209.85.216.199]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1ecCoh-0001E2-83 for kernel-team@lists.ubuntu.com; Thu, 18 Jan 2018 16:13:27 +0000 Received: by mail-qt0-f199.google.com with SMTP id e2so20612083qti.3 for ; Thu, 18 Jan 2018 08:13:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=lygvoAgD9i9e3NYen24YPIG+8sPzO+3e2MF31WSg1eU=; b=dZNa0o4Mk2LivP5b2vSItiP1EAGc6R5CnYJ6/TZ9hzuC7jkVK0w8QRVuZ3KUBaJVQx +5JTjRBfMtrCL5DOnZ5cNKukoDZfoz5se8MPKTgqRoOfhBCaAcWfRUPDSUAYDjSFMnyH adHzvJW8kT+WrAHuRnNDcJ3lSQ7HHuza2E7fyhgaTr0EMrxajQLIbok88htescM9Fn0O XdgbLRS/e50GDxUopPAkkeRq1Mu5W+mt2taHCGbbP3EDWtaBGpkKGY2MQf/emzFWUP0W jtvJXVcUEUjvNNp4GW+InFYblZaJ9G2XT32htyef/B4nMXcTA8FfhIXjJvIAdh0SqFym IZGg== X-Gm-Message-State: AKwxytc/RueBPKlREgvNucDKjKMxiy2LV03/n1XCGic/pA+F0ZhdnO9S cAFv1MHpGZw2UL+1g4me4isCALVOxDXypAc9WickfsgY2yiwaaGIn80VxV09l/BBGrJ/2AMbTZr kZJk6m/ruFZmsMF0oBNHJl1wklN2o63D1GTNZink5 X-Received: by 10.55.158.5 with SMTP id h5mr25306933qke.284.1516292006023; Thu, 18 Jan 2018 08:13:26 -0800 (PST) X-Google-Smtp-Source: ACJfBov8+sudcCd80/0j3HAjb6XODv1/AVLjuMEw4Ci+4XDXg7mH1jxIhCInKBAsqovhn8Z8CnzGWA== X-Received: by 10.55.158.5 with SMTP id h5mr25306919qke.284.1516292005792; Thu, 18 Jan 2018 08:13:25 -0800 (PST) Received: from localhost.localdomain (189-19-115-4.dsl.telesp.net.br. [189.19.115.4]) by smtp.gmail.com with ESMTPSA id d76sm4686791qkb.84.2018.01.18.08.13.24 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jan 2018 08:13:24 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [xenial][PATCH 2/3] UBUNTU: SAUCE: s390: print messages for gmb and nobp Date: Thu, 18 Jan 2018 14:13:13 -0200 Message-Id: <1516291994-11660-3-git-send-email-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516291994-11660-1-git-send-email-marcelo.cerri@canonical.com> References: <1516291923-11189-1-git-send-email-marcelo.cerri@canonical.com> <1516291994-11660-1-git-send-email-marcelo.cerri@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" CVE-2017-5753 CVE-2017-5715 Signed-off-by: Marcelo Henrique Cerri --- arch/s390/kernel/alternative.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/arch/s390/kernel/alternative.c b/arch/s390/kernel/alternative.c index 4e443fe369c9..c86d14a6c235 100644 --- a/arch/s390/kernel/alternative.c +++ b/arch/s390/kernel/alternative.c @@ -137,5 +137,11 @@ void __init_or_module apply_alternatives(struct alt_instr *start, extern struct alt_instr __alt_instructions[], __alt_instructions_end[]; void __init apply_alternative_instructions(void) { + pr_info("gmb %s", + (__test_facility(81, S390_lowcore.alt_stfle_fac_list)) ? + "enabled" : "disabled"); + pr_info("nobp %s", + (__test_facility(82, S390_lowcore.alt_stfle_fac_list)) ? + "enabled" : "disabled"); apply_alternatives(__alt_instructions, __alt_instructions_end); } From patchwork Thu Jan 18 16:13:14 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marcelo Henrique Cerri X-Patchwork-Id: 863001 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3zMpsq6S7qz9s7g; Fri, 19 Jan 2018 03:13:35 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1ecCol-0005Mm-JW; Thu, 18 Jan 2018 16:13:31 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1ecCoj-0005Lg-Vg for kernel-team@lists.ubuntu.com; Thu, 18 Jan 2018 16:13:29 +0000 Received: from mail-qt0-f197.google.com ([209.85.216.197]) by youngberry.canonical.com with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1ecCoj-0001EA-Lt for kernel-team@lists.ubuntu.com; Thu, 18 Jan 2018 16:13:29 +0000 Received: by mail-qt0-f197.google.com with SMTP id q63so12150542qtd.12 for ; Thu, 18 Jan 2018 08:13:29 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=55wA70M2+jUwWANexxrMCp5KGtxdnNpRpjMn1MI0Oio=; b=l3d7XmELpugWES9VhZK5VcRMsXSgK+KqMLDH2KNHVCr9qyYCmdoqddN920JJWfmwGX SRBcE2UTjJlegbDr4x3pYJFq/ITwFIFcDPkdqXiL70g/63ing9D+juJ5t6mXlvpB1iPR N6b2+0d6xdZYt3VkmWjovvXQUpxuhth9DSPkPE07W3C2PFeT48nr16WeyKBrO4xCq/q4 i6mCbPv2shLZCSH7gjf8kfotvJOOpoozIArXkWI+Tdm8tzcTSgPgxlQV1W2rvZg/+txR Gpd35SMd5aDW0+fZDBuZFPueKHvz/MI4mmSWqsqmGTCUyPALBmjiI48WUrDZdWbytytG kyiw== X-Gm-Message-State: AKwxytdPC95ikn1WMSM3v8HJC5KFX10tIKOORafnj1kvSCgJYICx2pQb 2zP7h7M+eVjR3sQ52fhs/X1pilmC4rJaGoq7tLjgbUQqKBjqD9/03o7zbW8oRug6pI/untjEbqW HcU76G1dC+K5Euki+1opkr/9jUFCSxq/y7NGcqdcH X-Received: by 10.55.177.135 with SMTP id a129mr24501388qkf.112.1516292008409; Thu, 18 Jan 2018 08:13:28 -0800 (PST) X-Google-Smtp-Source: ACJfBouSys5CKDtsdGqy3D9j6mRhqXkIJYRlu7rtTWbDzk/4z2Qo9LoF2Yxom2fDt12Yw/tJeH3oSA== X-Received: by 10.55.177.135 with SMTP id a129mr24501363qkf.112.1516292008127; Thu, 18 Jan 2018 08:13:28 -0800 (PST) Received: from localhost.localdomain (189-19-115-4.dsl.telesp.net.br. [189.19.115.4]) by smtp.gmail.com with ESMTPSA id d76sm4686791qkb.84.2018.01.18.08.13.26 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 18 Jan 2018 08:13:26 -0800 (PST) From: Marcelo Henrique Cerri To: kernel-team@lists.ubuntu.com Subject: [xenial][PATCH 3/3] UBUNTU: [Config] KERNEL_NOBP=y Date: Thu, 18 Jan 2018 14:13:14 -0200 Message-Id: <1516291994-11660-4-git-send-email-marcelo.cerri@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1516291994-11660-1-git-send-email-marcelo.cerri@canonical.com> References: <1516291923-11189-1-git-send-email-marcelo.cerri@canonical.com> <1516291994-11660-1-git-send-email-marcelo.cerri@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" CVE-2017-5753 CVE-2017-5715 Signed-off-by: Marcelo Henrique Cerri --- debian.master/config/config.common.ubuntu | 1 + 1 file changed, 1 insertion(+) diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 45bc4d35842d..72734ae3a59f 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -3994,6 +3994,7 @@ CONFIG_KEMPLD_WDT=m # CONFIG_KERNEL_LZMA is not set # CONFIG_KERNEL_LZO is not set CONFIG_KERNEL_MODE_NEON=y +CONFIG_KERNEL_NOBP=y CONFIG_KERNFS=y CONFIG_KEXEC=y CONFIG_KEXEC_BZIMAGE_VERIFY_SIG=y