From da0a0f7cd1c4a98e15947e381e622d852d20d655 Mon Sep 17 00:00:00 2001 From: Alexander Popov Date: Thu, 17 Nov 2022 16:57:25 +0300 Subject: [PATCH] Do refactoring in normalize_cmdline_options() --- kconfig_hardened_check/__init__.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/kconfig_hardened_check/__init__.py b/kconfig_hardened_check/__init__.py index 7333e61..837a362 100644 --- a/kconfig_hardened_check/__init__.py +++ b/kconfig_hardened_check/__init__.py @@ -940,17 +940,17 @@ def parse_kconfig_file(parsed_options, fname): def normalize_cmdline_options(option, value): # Don't normalize the cmdline option values if # the Linux kernel doesn't use kstrtobool() for them - if option == 'pti': - # See pti_check_boottime_disable() in linux/arch/x86/mm/pti.c - return value - if option == 'spectre_v2': - # See spectre_v2_parse_cmdline() in linux/arch/x86/kernel/cpu/bugs.c - return value if option == 'debugfs': # See debugfs_kernel() in fs/debugfs/inode.c return value if option == 'mitigations': - # See mitigations_parse_cmdline() in linux/kernel/cpu.c + # See mitigations_parse_cmdline() in kernel/cpu.c + return value + if option == 'pti': + # See pti_check_boottime_disable() in arch/x86/mm/pti.c + return value + if option == 'spectre_v2': + # See spectre_v2_parse_cmdline() in arch/x86/kernel/cpu/bugs.c return value if option == 'spec_store_bypass_disable': # See ssb_parse_cmdline() in arch/x86/kernel/cpu/bugs.c -- 2.31.1