UBUNTU: SAUCE: s390: print messages for gmb and nobp

CVE-2017-5753
CVE-2017-5715

Acked-by: Khalid Elmously <khalid.elmously@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Signed-off-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>

diff --git a/arch/s390/kernel/alternative.c b/arch/s390/kernel/alternative.c
index 4e2ddfc7364da828315edf9d58b300230314f0cf..5bd44c52eb1d3985fc3ed9305d3ad91b058566b6 100644 (file)
--- 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);
 }