16 files changed, 519 insertions, 51 deletions

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index ca21a35fa244..bb015551c2d9 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -140,17 +140,9 @@ cc-option-yn = $(call try-run,\
 cc-disable-warning = $(call try-run,\
         $(CC) -Werror $(KBUILD_CPPFLAGS) $(CC_OPTION_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
 
-# cc-name
-# Expands to either gcc or clang
-cc-name = $(shell $(CC) -v 2>&1 | grep -q "clang version" && echo clang || echo gcc)
-
 # cc-version
 cc-version = $(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-version.sh $(CC))
 
-# cc-fullversion
-cc-fullversion = $(shell $(CONFIG_SHELL) \
-        $(srctree)/scripts/gcc-version.sh -p $(CC))
-
 # cc-ifversion
 # Usage:  EXTRA_CFLAGS += $(call cc-ifversion, -lt, 0402, -O1)
 cc-ifversion = $(shell [ $(cc-version) $(1) $(2) ] && echo $(3) || echo $(4))
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index a8e7ba9f73e8..6a6be9f440cf 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -236,10 +236,8 @@ ifdef CONFIG_GCOV_KERNEL
 objtool_args += --no-unreachable
 endif
 ifdef CONFIG_RETPOLINE
-ifneq ($(RETPOLINE_CFLAGS),)
   objtool_args += --retpoline
 endif
-endif
 
 
 ifdef CONFIG_MODVERSIONS
diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn
index 24b2fb1d1297..768306add591 100644
--- a/scripts/Makefile.extrawarn
+++ b/scripts/Makefile.extrawarn
@@ -29,6 +29,7 @@ warning-1 += $(call cc-option, -Wmissing-include-dirs)
 warning-1 += $(call cc-option, -Wunused-but-set-variable)
 warning-1 += $(call cc-option, -Wunused-const-variable)
 warning-1 += $(call cc-option, -Wpacked-not-aligned)
+warning-1 += $(call cc-option, -Wstringop-truncation)
 warning-1 += $(call cc-disable-warning, missing-field-initializers)
 warning-1 += $(call cc-disable-warning, sign-compare)
 
@@ -64,7 +65,7 @@ endif
 KBUILD_CFLAGS += $(warning)
 else
 
-ifeq ($(cc-name),clang)
+ifdef CONFIG_CC_IS_CLANG
 KBUILD_CFLAGS += $(call cc-disable-warning, initializer-overrides)
 KBUILD_CFLAGS += $(call cc-disable-warning, unused-value)
 KBUILD_CFLAGS += $(call cc-disable-warning, format)
diff --git a/scripts/Makefile.gcc-plugins b/scripts/Makefile.gcc-plugins
index 0a482f341576..46c5c6809806 100644
--- a/scripts/Makefile.gcc-plugins
+++ b/scripts/Makefile.gcc-plugins
@@ -26,6 +26,16 @@ gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_RANDSTRUCT)		\
 gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE)   \
                 += -fplugin-arg-randomize_layout_plugin-performance-mode
 
+gcc-plugin-$(CONFIG_GCC_PLUGIN_STACKLEAK)       += stackleak_plugin.so
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STACKLEAK)                \
+                += -DSTACKLEAK_PLUGIN
+gcc-plugin-cflags-$(CONFIG_GCC_PLUGIN_STACKLEAK)                \
+                += -fplugin-arg-stackleak_plugin-track-min-size=$(CONFIG_STACKLEAK_TRACK_MIN_SIZE)
+ifdef CONFIG_GCC_PLUGIN_STACKLEAK
+    DISABLE_STACKLEAK_PLUGIN += -fplugin-arg-stackleak_plugin-disable
+endif
+export DISABLE_STACKLEAK_PLUGIN
+
 # All the plugin CFLAGS are collected here in case a build target needs to
 # filter them out of the KBUILD_CFLAGS.
 GCC_PLUGINS_CFLAGS := $(strip $(addprefix -fplugin=$(objtree)/scripts/gcc-plugins/, $(gcc-plugin-y)) $(gcc-plugin-cflags-y))
diff --git a/scripts/faddr2line b/scripts/faddr2line
index a0149db00be7..6c6439f69a72 100755
--- a/scripts/faddr2line
+++ b/scripts/faddr2line
@@ -71,7 +71,7 @@ die() {
 
 # Try to figure out the source directory prefix so we can remove it from the
 # addr2line output.  HACK ALERT: This assumes that start_kernel() is in
-# kernel/init.c!  This only works for vmlinux.  Otherwise it falls back to
+# init/main.c!  This only works for vmlinux.  Otherwise it falls back to
 # printing the absolute path.
 find_dir_prefix() {
         local objfile=$1
diff --git a/scripts/gcc-plugins/Kconfig b/scripts/gcc-plugins/Kconfig
index cb0c889e13aa..0d5c799688f0 100644
--- a/scripts/gcc-plugins/Kconfig
+++ b/scripts/gcc-plugins/Kconfig
@@ -139,4 +139,55 @@ config GCC_PLUGIN_RANDSTRUCT_PERFORMANCE
           in structures.  This reduces the performance hit of RANDSTRUCT
           at the cost of weakened randomization.
 
+config GCC_PLUGIN_STACKLEAK
+        bool "Erase the kernel stack before returning from syscalls"
+        depends on GCC_PLUGINS
+        depends on HAVE_ARCH_STACKLEAK
+        help
+          This option makes the kernel erase the kernel stack before
+          returning from system calls. That reduces the information which
+          kernel stack leak bugs can reveal and blocks some uninitialized
+          stack variable attacks.
+
+          The tradeoff is the performance impact: on a single CPU system kernel
+          compilation sees a 1% slowdown, other systems and workloads may vary
+          and you are advised to test this feature on your expected workload
+          before deploying it.
+
+          This plugin was ported from grsecurity/PaX. More information at:
+           * https://grsecurity.net/
+           * https://pax.grsecurity.net/
+
+config STACKLEAK_TRACK_MIN_SIZE
+        int "Minimum stack frame size of functions tracked by STACKLEAK"
+        default 100
+        range 0 4096
+        depends on GCC_PLUGIN_STACKLEAK
+        help
+          The STACKLEAK gcc plugin instruments the kernel code for tracking
+          the lowest border of the kernel stack (and for some other purposes).
+          It inserts the stackleak_track_stack() call for the functions with
+          a stack frame size greater than or equal to this parameter.
+          If unsure, leave the default value 100.
+
+config STACKLEAK_METRICS
+        bool "Show STACKLEAK metrics in the /proc file system"
+        depends on GCC_PLUGIN_STACKLEAK
+        depends on PROC_FS
+        help
+          If this is set, STACKLEAK metrics for every task are available in
+          the /proc file system. In particular, /proc/<pid>/stack_depth
+          shows the maximum kernel stack consumption for the current and
+          previous syscalls. Although this information is not precise, it
+          can be useful for estimating the STACKLEAK performance impact for
+          your workloads.
+
+config STACKLEAK_RUNTIME_DISABLE
+        bool "Allow runtime disabling of kernel stack erasing"
+        depends on GCC_PLUGIN_STACKLEAK
+        help
+          This option provides 'stack_erasing' sysctl, which can be used in
+          runtime to control kernel stack erasing for kernels built with
+          CONFIG_GCC_PLUGIN_STACKLEAK.
+
 endif
diff --git a/scripts/gcc-plugins/stackleak_plugin.c b/scripts/gcc-plugins/stackleak_plugin.c
new file mode 100644
index 000000000000..dbd37460c573
--- /dev/null
+++ b/scripts/gcc-plugins/stackleak_plugin.c
@@ -0,0 +1,429 @@
+/*
+ * Copyright 2011-2017 by the PaX Team <pageexec@freemail.hu>
+ * Modified by Alexander Popov <alex.popov@linux.com>
+ * Licensed under the GPL v2
+ *
+ * Note: the choice of the license means that the compilation process is
+ * NOT 'eligible' as defined by gcc's library exception to the GPL v3,
+ * but for the kernel it doesn't matter since it doesn't link against
+ * any of the gcc libraries
+ *
+ * This gcc plugin is needed for tracking the lowest border of the kernel stack.
+ * It instruments the kernel code inserting stackleak_track_stack() calls:
+ *  - after alloca();
+ *  - for the functions with a stack frame size greater than or equal
+ *     to the "track-min-size" plugin parameter.
+ *
+ * This plugin is ported from grsecurity/PaX. For more information see:
+ *   https://grsecurity.net/
+ *   https://pax.grsecurity.net/
+ *
+ * Debugging:
+ *  - use fprintf() to stderr, debug_generic_expr(), debug_gimple_stmt(),
+ *     print_rtl() and print_simple_rtl();
+ *  - add "-fdump-tree-all -fdump-rtl-all" to the plugin CFLAGS in
+ *     Makefile.gcc-plugins to see the verbose dumps of the gcc passes;
+ *  - use gcc -E to understand the preprocessing shenanigans;
+ *  - use gcc with enabled CFG/GIMPLE/SSA verification (--enable-checking).
+ */
+
+#include "gcc-common.h"
+
+__visible int plugin_is_GPL_compatible;
+
+static int track_frame_size = -1;
+static const char track_function[] = "stackleak_track_stack";
+
+/*
+ * Mark these global variables (roots) for gcc garbage collector since
+ * they point to the garbage-collected memory.
+ */
+static GTY(()) tree track_function_decl;
+
+static struct plugin_info stackleak_plugin_info = {
+        .version = "201707101337",
+        .help = "track-min-size=nn\ttrack stack for functions with a stack frame size >= nn bytes\n"
+                "disable\t\tdo not activate the plugin\n"
+};
+
+static void stackleak_add_track_stack(gimple_stmt_iterator *gsi, bool after)
+{
+        gimple stmt;
+        gcall *stackleak_track_stack;
+        cgraph_node_ptr node;
+        int frequency;
+        basic_block bb;
+
+        /* Insert call to void stackleak_track_stack(void) */
+        stmt = gimple_build_call(track_function_decl, 0);
+        stackleak_track_stack = as_a_gcall(stmt);
+        if (after) {
+                gsi_insert_after(gsi, stackleak_track_stack,
+                                                GSI_CONTINUE_LINKING);
+        } else {
+                gsi_insert_before(gsi, stackleak_track_stack, GSI_SAME_STMT);
+        }
+
+        /* Update the cgraph */
+        bb = gimple_bb(stackleak_track_stack);
+        node = cgraph_get_create_node(track_function_decl);
+        gcc_assert(node);
+        frequency = compute_call_stmt_bb_frequency(current_function_decl, bb);
+        cgraph_create_edge(cgraph_get_node(current_function_decl), node,
+                        stackleak_track_stack, bb->count, frequency);
+}
+
+static bool is_alloca(gimple stmt)
+{
+        if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA))
+                return true;
+
+#if BUILDING_GCC_VERSION >= 4007
+        if (gimple_call_builtin_p(stmt, BUILT_IN_ALLOCA_WITH_ALIGN))
+                return true;
+#endif
+
+        return false;
+}
+
+/*
+ * Work with the GIMPLE representation of the code. Insert the
+ * stackleak_track_stack() call after alloca() and into the beginning
+ * of the function if it is not instrumented.
+ */
+static unsigned int stackleak_instrument_execute(void)
+{
+        basic_block bb, entry_bb;
+        bool prologue_instrumented = false, is_leaf = true;
+        gimple_stmt_iterator gsi;
+
+        /*
+         * ENTRY_BLOCK_PTR is a basic block which represents possible entry
+         * point of a function. This block does not contain any code and
+         * has a CFG edge to its successor.
+         */
+        gcc_assert(single_succ_p(ENTRY_BLOCK_PTR_FOR_FN(cfun)));
+        entry_bb = single_succ(ENTRY_BLOCK_PTR_FOR_FN(cfun));
+
+        /*
+         * Loop through the GIMPLE statements in each of cfun basic blocks.
+         * cfun is a global variable which represents the function that is
+         * currently processed.
+         */
+        FOR_EACH_BB_FN(bb, cfun) {
+                for (gsi = gsi_start_bb(bb); !gsi_end_p(gsi); gsi_next(&gsi)) {
+                        gimple stmt;
+
+                        stmt = gsi_stmt(gsi);
+
+                        /* Leaf function is a function which makes no calls */
+                        if (is_gimple_call(stmt))
+                                is_leaf = false;
+
+                        if (!is_alloca(stmt))
+                                continue;
+
+                        /* Insert stackleak_track_stack() call after alloca() */
+                        stackleak_add_track_stack(&gsi, true);
+                        if (bb == entry_bb)
+                                prologue_instrumented = true;
+                }
+        }
+
+        if (prologue_instrumented)
+                return 0;
+
+        /*
+         * Special cases to skip the instrumentation.
+         *
+         * Taking the address of static inline functions materializes them,
+         * but we mustn't instrument some of them as the resulting stack
+         * alignment required by the function call ABI will break other
+         * assumptions regarding the expected (but not otherwise enforced)
+         * register clobbering ABI.
+         *
+         * Case in point: native_save_fl on amd64 when optimized for size
+         * clobbers rdx if it were instrumented here.
+         *
+         * TODO: any more special cases?
+         */
+        if (is_leaf &&
+            !TREE_PUBLIC(current_function_decl) &&
+            DECL_DECLARED_INLINE_P(current_function_decl)) {
+                return 0;
+        }
+
+        if (is_leaf &&
+            !strncmp(IDENTIFIER_POINTER(DECL_NAME(current_function_decl)),
+                     "_paravirt_", 10)) {
+                return 0;
+        }
+
+        /* Insert stackleak_track_stack() call at the function beginning */
+        bb = entry_bb;
+        if (!single_pred_p(bb)) {
+                /* gcc_assert(bb_loop_depth(bb) ||
+                                (bb->flags & BB_IRREDUCIBLE_LOOP)); */
+                split_edge(single_succ_edge(ENTRY_BLOCK_PTR_FOR_FN(cfun)));
+                gcc_assert(single_succ_p(ENTRY_BLOCK_PTR_FOR_FN(cfun)));
+                bb = single_succ(ENTRY_BLOCK_PTR_FOR_FN(cfun));
+        }
+        gsi = gsi_after_labels(bb);
+        stackleak_add_track_stack(&gsi, false);
+
+        return 0;
+}
+
+static bool large_stack_frame(void)
+{
+#if BUILDING_GCC_VERSION >= 8000
+        return maybe_ge(get_frame_size(), track_frame_size);
+#else
+        return (get_frame_size() >= track_frame_size);
+#endif
+}
+
+/*
+ * Work with the RTL representation of the code.
+ * Remove the unneeded stackleak_track_stack() calls from the functions
+ * which don't call alloca() and don't have a large enough stack frame size.
+ */
+static unsigned int stackleak_cleanup_execute(void)
+{
+        rtx_insn *insn, *next;
+
+        if (cfun->calls_alloca)
+                return 0;
+
+        if (large_stack_frame())
+                return 0;
+
+        /*
+         * Find stackleak_track_stack() calls. Loop through the chain of insns,
+         * which is an RTL representation of the code for a function.
+         *
+         * The example of a matching insn:
+         *  (call_insn 8 4 10 2 (call (mem (symbol_ref ("stackleak_track_stack")
+         *  [flags 0x41] <function_decl 0x7f7cd3302a80 stackleak_track_stack>)
+         *  [0 stackleak_track_stack S1 A8]) (0)) 675 {*call} (expr_list
+         *  (symbol_ref ("stackleak_track_stack") [flags 0x41] <function_decl
+         *  0x7f7cd3302a80 stackleak_track_stack>) (expr_list (0) (nil))) (nil))
+         */
+        for (insn = get_insns(); insn; insn = next) {
+                rtx body;
+
+                next = NEXT_INSN(insn);
+
+                /* Check the expression code of the insn */
+                if (!CALL_P(insn))
+                        continue;
+
+                /*
+                 * Check the expression code of the insn body, which is an RTL
+                 * Expression (RTX) describing the side effect performed by
+                 * that insn.
+                 */
+                body = PATTERN(insn);
+
+                if (GET_CODE(body) == PARALLEL)
+                        body = XVECEXP(body, 0, 0);
+
+                if (GET_CODE(body) != CALL)
+                        continue;
+
+                /*
+                 * Check the first operand of the call expression. It should
+                 * be a mem RTX describing the needed subroutine with a
+                 * symbol_ref RTX.
+                 */
+                body = XEXP(body, 0);
+                if (GET_CODE(body) != MEM)
+                        continue;
+
+                body = XEXP(body, 0);
+                if (GET_CODE(body) != SYMBOL_REF)
+                        continue;
+
+                if (SYMBOL_REF_DECL(body) != track_function_decl)
+                        continue;
+
+                /* Delete the stackleak_track_stack() call */
+                delete_insn_and_edges(insn);
+#if BUILDING_GCC_VERSION >= 4007 && BUILDING_GCC_VERSION < 8000
+                if (GET_CODE(next) == NOTE &&
+                    NOTE_KIND(next) == NOTE_INSN_CALL_ARG_LOCATION) {
+                        insn = next;
+                        next = NEXT_INSN(insn);
+                        delete_insn_and_edges(insn);
+                }
+#endif
+        }
+
+        return 0;
+}
+
+static bool stackleak_gate(void)
+{
+        tree section;
+
+        section = lookup_attribute("section",
+                                   DECL_ATTRIBUTES(current_function_decl));
+        if (section && TREE_VALUE(section)) {
+                section = TREE_VALUE(TREE_VALUE(section));
+
+                if (!strncmp(TREE_STRING_POINTER(section), ".init.text", 10))
+                        return false;
+                if (!strncmp(TREE_STRING_POINTER(section), ".devinit.text", 13))
+                        return false;
+                if (!strncmp(TREE_STRING_POINTER(section), ".cpuinit.text", 13))
+                        return false;
+                if (!strncmp(TREE_STRING_POINTER(section), ".meminit.text", 13))
+                        return false;
+        }
+
+        return track_frame_size >= 0;
+}
+
+/* Build the function declaration for stackleak_track_stack() */
+static void stackleak_start_unit(void *gcc_data __unused,
+                                 void *user_data __unused)
+{
+        tree fntype;
+
+        /* void stackleak_track_stack(void) */
+        fntype = build_function_type_list(void_type_node, NULL_TREE);
+        track_function_decl = build_fn_decl(track_function, fntype);
+        DECL_ASSEMBLER_NAME(track_function_decl); /* for LTO */
+        TREE_PUBLIC(track_function_decl) = 1;
+        TREE_USED(track_function_decl) = 1;
+        DECL_EXTERNAL(track_function_decl) = 1;
+        DECL_ARTIFICIAL(track_function_decl) = 1;
+        DECL_PRESERVE_P(track_function_decl) = 1;
+}
+
+/*
+ * Pass gate function is a predicate function that gets executed before the
+ * corresponding pass. If the return value is 'true' the pass gets executed,
+ * otherwise, it is skipped.
+ */
+static bool stackleak_instrument_gate(void)
+{
+        return stackleak_gate();
+}
+
+#define PASS_NAME stackleak_instrument
+#define PROPERTIES_REQUIRED PROP_gimple_leh | PROP_cfg
+#define TODO_FLAGS_START TODO_verify_ssa | TODO_verify_flow | TODO_verify_stmts
+#define TODO_FLAGS_FINISH TODO_verify_ssa | TODO_verify_stmts | TODO_dump_func \
+                        | TODO_update_ssa | TODO_rebuild_cgraph_edges
+#include "gcc-generate-gimple-pass.h"
+
+static bool stackleak_cleanup_gate(void)
+{
+        return stackleak_gate();
+}
+
+#define PASS_NAME stackleak_cleanup
+#define TODO_FLAGS_FINISH TODO_dump_func
+#include "gcc-generate-rtl-pass.h"
+
+/*
+ * Every gcc plugin exports a plugin_init() function that is called right
+ * after the plugin is loaded. This function is responsible for registering
+ * the plugin callbacks and doing other required initialization.
+ */
+__visible int plugin_init(struct plugin_name_args *plugin_info,
+                          struct plugin_gcc_version *version)
+{
+        const char * const plugin_name = plugin_info->base_name;
+        const int argc = plugin_info->argc;
+        const struct plugin_argument * const argv = plugin_info->argv;
+        int i = 0;
+
+        /* Extra GGC root tables describing our GTY-ed data */
+        static const struct ggc_root_tab gt_ggc_r_gt_stackleak[] = {
+                {
+                        .base = &track_function_decl,
+                        .nelt = 1,
+                        .stride = sizeof(track_function_decl),
+                        .cb = &gt_ggc_mx_tree_node,
+                        .pchw = &gt_pch_nx_tree_node
+                },
+                LAST_GGC_ROOT_TAB
+        };
+
+        /*
+         * The stackleak_instrument pass should be executed before the
+         * "optimized" pass, which is the control flow graph cleanup that is
+         * performed just before expanding gcc trees to the RTL. In former
+         * versions of the plugin this new pass was inserted before the
+         * "tree_profile" pass, which is currently called "profile".
+         */
+        PASS_INFO(stackleak_instrument, "optimized", 1,
+                                                PASS_POS_INSERT_BEFORE);
+
+        /*
+         * The stackleak_cleanup pass should be executed before the "*free_cfg"
+         * pass. It's the moment when the stack frame size is already final,
+         * function prologues and epilogues are generated, and the
+         * machine-dependent code transformations are not done.
+         */
+        PASS_INFO(stackleak_cleanup, "*free_cfg", 1, PASS_POS_INSERT_BEFORE);
+
+        if (!plugin_default_version_check(version, &gcc_version)) {
+                error(G_("incompatible gcc/plugin versions"));
+                return 1;
+        }
+
+        /* Parse the plugin arguments */
+        for (i = 0; i < argc; i++) {
+                if (!strcmp(argv[i].key, "disable"))
+                        return 0;
+
+                if (!strcmp(argv[i].key, "track-min-size")) {
+                        if (!argv[i].value) {
+                                error(G_("no value supplied for option '-fplugin-arg-%s-%s'"),
+                                        plugin_name, argv[i].key);
+                                return 1;
+                        }
+
+                        track_frame_size = atoi(argv[i].value);
+                        if (track_frame_size < 0) {
+                                error(G_("invalid option argument '-fplugin-arg-%s-%s=%s'"),
+                                        plugin_name, argv[i].key, argv[i].value);
+                                return 1;
+                        }
+                } else {
+                        error(G_("unknown option '-fplugin-arg-%s-%s'"),
+                                        plugin_name, argv[i].key);
+                        return 1;
+                }
+        }
+
+        /* Give the information about the plugin */
+        register_callback(plugin_name, PLUGIN_INFO, NULL,
+                                                &stackleak_plugin_info);
+
+        /* Register to be called before processing a translation unit */
+        register_callback(plugin_name, PLUGIN_START_UNIT,
+                                        &stackleak_start_unit, NULL);
+
+        /* Register an extra GCC garbage collector (GGC) root table */
+        register_callback(plugin_name, PLUGIN_REGISTER_GGC_ROOTS, NULL,
+                                        (void *)&gt_ggc_r_gt_stackleak);
+
+        /*
+         * Hook into the Pass Manager to register new gcc passes.
+         *
+         * The stack frame size info is available only at the last RTL pass,
+         * when it's too late to insert complex code like a function call.
+         * So we register two gcc passes to instrument every function at first
+         * and remove the unneeded instrumentation later.
+         */
+        register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL,
+                                        &stackleak_instrument_pass_info);
+        register_callback(plugin_name, PLUGIN_PASS_MANAGER_SETUP, NULL,
+                                        &stackleak_cleanup_pass_info);
+
+        return 0;
+}
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 67ed9f6ccdf8..63b609243d03 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -68,21 +68,7 @@ PHONY += $(simple-targets)
 $(simple-targets): $(obj)/conf
         $< $(silent) --$@ $(Kconfig)
 
-PHONY += oldnoconfig silentoldconfig savedefconfig defconfig
-
-# oldnoconfig is an alias of olddefconfig, because people already are dependent
-# on its behavior (sets new symbols to their default value but not 'n') with the
-# counter-intuitive name.
-oldnoconfig: olddefconfig
-        @echo "  WARNING: \"oldnoconfig\" target will be removed after Linux 4.19"
-        @echo "            Please use \"olddefconfig\" instead, which is an alias."
-
-# We do not expect manual invokcation of "silentoldcofig" (or "syncconfig").
-silentoldconfig: syncconfig
-        @echo "  WARNING: \"silentoldconfig\" has been renamed to \"syncconfig\""
-        @echo "            and is now an internal implementation detail."
-        @echo "            What you want is probably \"oldconfig\"."
-        @echo "            \"silentoldconfig\" will be removed after Linux 4.19"
+PHONY += savedefconfig defconfig
 
 savedefconfig: $(obj)/conf
         $< $(silent) --$@=defconfig $(Kconfig)
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 7b2b37260669..98e0c7a34699 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -460,12 +460,6 @@ static struct option long_opts[] = {
         {"randconfig",      no_argument,       NULL, randconfig},
         {"listnewconfig",   no_argument,       NULL, listnewconfig},
         {"olddefconfig",    no_argument,       NULL, olddefconfig},
-        /*
-         * oldnoconfig is an alias of olddefconfig, because people already
-         * are dependent on its behavior(sets new symbols to their default
-         * value but not 'n') with the counter-intuitive name.
-         */
-        {"oldnoconfig",     no_argument,       NULL, olddefconfig},
         {NULL, 0, NULL, 0}
 };
 
@@ -480,7 +474,6 @@ static void conf_usage(const char *progname)
         printf("  --syncconfig            Similar to oldconfig but generates configuration in\n"
                "                          include/{generated/,config/}\n");
         printf("  --olddefconfig          Same as oldconfig but sets new symbols to their default value\n");
-        printf("  --oldnoconfig           An alias of olddefconfig\n");
         printf("  --defconfig <file>      New config with default defined in <file>\n");
         printf("  --savedefconfig <file>  Save the minimal current configuration to <file>\n");
         printf("  --allnoconfig           New config where all options are answered with no\n");
diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index 67d131447631..0ef906499646 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -33,12 +33,15 @@ usage() {
         echo "  -n    use allnoconfig instead of alldefconfig"
         echo "  -r    list redundant entries when merging fragments"
         echo "  -O    dir to put generated output files.  Consider setting \$KCONFIG_CONFIG instead."
+        echo
+        echo "Used prefix: '$CONFIG_PREFIX'. You can redefine it with \$CONFIG_ environment variable."
 }
 
 RUNMAKE=true
 ALLTARGET=alldefconfig
 WARNREDUN=false
 OUTPUT=.
+CONFIG_PREFIX=${CONFIG_-CONFIG_}
 
 while true; do
         case $1 in
@@ -99,7 +102,9 @@ if [ ! -r "$INITFILE" ]; then
 fi
 
 MERGE_LIST=$*
-SED_CONFIG_EXP="s/^\(# \)\{0,1\}\(CONFIG_[a-zA-Z0-9_]*\)[= ].*/\2/p"
+SED_CONFIG_EXP1="s/^\(${CONFIG_PREFIX}[a-zA-Z0-9_]*\)=.*/\1/p"
+SED_CONFIG_EXP2="s/^# \(${CONFIG_PREFIX}[a-zA-Z0-9_]*\) is not set$/\1/p"
+
 TMP_FILE=$(mktemp ./.tmp.config.XXXXXXXXXX)
 
 echo "Using $INITFILE as base"
@@ -112,7 +117,7 @@ for MERGE_FILE in $MERGE_LIST ; do
                 echo "The merge file '$MERGE_FILE' does not exist.  Exit." >&2
                 exit 1
         fi
-        CFG_LIST=$(sed -n "$SED_CONFIG_EXP" $MERGE_FILE)
+        CFG_LIST=$(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $MERGE_FILE)
 
         for CFG in $CFG_LIST ; do
                 grep -q -w $CFG $TMP_FILE || continue
@@ -155,7 +160,7 @@ make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
 
 
 # Check all specified config values took (might have missed-dependency issues)
-for CFG in $(sed -n "$SED_CONFIG_EXP" $TMP_FILE); do
+for CFG in $(sed -n -e "$SED_CONFIG_EXP1" -e "$SED_CONFIG_EXP2" $TMP_FILE); do
 
         REQUESTED_VAL=$(grep -w -e "$CFG" $TMP_FILE)
         ACTUAL_VAL=$(grep -w -e "$CFG" "$KCONFIG_CONFIG")
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 90c9a8ac7adb..f43a274f4f1d 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -81,11 +81,11 @@ else
         cp System.map "$tmpdir/boot/System.map-$version"
         cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version"
 fi
-cp "$($MAKE -s image_name)" "$tmpdir/$installed_image_path"
+cp "$($MAKE -s -f $srctree/Makefile image_name)" "$tmpdir/$installed_image_path"
 
-if grep -q "^CONFIG_OF=y" $KCONFIG_CONFIG ; then
+if grep -q "^CONFIG_OF_EARLY_FLATTREE=y" $KCONFIG_CONFIG ; then
         # Only some architectures with OF support have this target
-        if grep -q dtbs_install "${srctree}/arch/$SRCARCH/Makefile"; then
+        if [ -d "${srctree}/arch/$SRCARCH/boot/dts" ]; then
                 $MAKE KBUILD_SRC= INSTALL_DTBS_PATH="$tmpdir/usr/lib/$packagename" dtbs_install
         fi
 fi
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 663a7f343b42..edcad61fe3cd 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -88,6 +88,7 @@ set_debarch() {
 version=$KERNELRELEASE
 if [ -n "$KDEB_PKGVERSION" ]; then
         packageversion=$KDEB_PKGVERSION
+        revision=${packageversion##*-}
 else
         revision=$(cat .version 2>/dev/null||echo 1)
         packageversion=$version-$revision
@@ -205,10 +206,12 @@ cat <<EOF > debian/rules
 #!$(command -v $MAKE) -f
 
 build:
-        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC=
+        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
+        KBUILD_BUILD_VERSION=${revision} KBUILD_SRC=
 
 binary-arch:
-        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} KBUILD_SRC= intdeb-pkg
+        \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
+        KBUILD_BUILD_VERSION=${revision} KBUILD_SRC= intdeb-pkg
 
 clean:
         rm -rf debian/*tmp debian/files
diff --git a/scripts/package/mkspec b/scripts/package/mkspec
index e05646dc24dc..009147d4718e 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -12,6 +12,7 @@
 # how we were called determines which rpms we build and how we build them
 if [ "$1" = prebuilt ]; then
         S=DEL
+        MAKE="$MAKE -f $srctree/Makefile"
 else
         S=
 fi
@@ -78,19 +79,19 @@ $S	%prep
 $S      %setup -q
 $S
 $S      %build
-$S      make %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}
+$S      $MAKE %{?_smp_mflags} KBUILD_BUILD_VERSION=%{release}
 $S
         %install
         mkdir -p %{buildroot}/boot
         %ifarch ia64
         mkdir -p %{buildroot}/boot/efi
-        cp \$(make image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
+        cp \$($MAKE image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE
         ln -s efi/vmlinuz-$KERNELRELEASE %{buildroot}/boot/
         %else
-        cp \$(make image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
+        cp \$($MAKE image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE
         %endif
-$M      make %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} KBUILD_SRC= modules_install
-        make %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr KBUILD_SRC= headers_install
+$M      $MAKE %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} modules_install
+        $MAKE %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install
         cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE
         cp .config %{buildroot}/boot/config-$KERNELRELEASE
         bzip2 -9 --keep vmlinux
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 79f7dd57d571..71f39410691b 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -74,7 +74,7 @@ scm_version()
                 fi
 
                 # Check for uncommitted changes
-                if git status -uno --porcelain | grep -qv '^.. scripts/package'; then
+                if git diff-index --name-only HEAD | grep -qv "^scripts/package"; then
                         printf '%s' -dirty
                 fi
 
diff --git a/scripts/spdxcheck.py b/scripts/spdxcheck.py
index 839e190bbd7a..5056fb3b897d 100755
--- a/scripts/spdxcheck.py
+++ b/scripts/spdxcheck.py
@@ -168,7 +168,6 @@ class id_parser(object):
         self.curline = 0
         try:
             for line in fd:
-                line = line.decode(locale.getpreferredencoding(False), errors='ignore')
                 self.curline += 1
                 if self.curline > maxlines:
                     break
diff --git a/scripts/unifdef.c b/scripts/unifdef.c
index 7493c0ee51cc..db00e3e30a59 100644
--- a/scripts/unifdef.c
+++ b/scripts/unifdef.c
@@ -395,7 +395,7 @@ usage(void)
  * When we have processed a group that starts off with a known-false
  * #if/#elif sequence (which has therefore been deleted) followed by a
  * #elif that we don't understand and therefore must keep, we edit the
- * latter into a #if to keep the nesting correct. We use strncpy() to
+ * latter into a #if to keep the nesting correct. We use memcpy() to
  * overwrite the 4 byte token "elif" with "if  " without a '\0' byte.
  *
  * When we find a true #elif in a group, the following block will
@@ -450,7 +450,7 @@ static void Idrop (void) { Fdrop();  ignoreon(); }
 static void Itrue (void) { Ftrue();  ignoreon(); }
 static void Ifalse(void) { Ffalse(); ignoreon(); }
 /* modify this line */
-static void Mpass (void) { strncpy(keyword, "if  ", 4); Pelif(); }
+static void Mpass (void) { memcpy(keyword, "if  ", 4); Pelif(); }
 static void Mtrue (void) { keywordedit("else");  state(IS_TRUE_MIDDLE); }
 static void Melif (void) { keywordedit("endif"); state(IS_FALSE_TRAILER); }
 static void Melse (void) { keywordedit("endif"); state(IS_FALSE_ELSE); }