From ae4f977a537483f8bcf01028bc43efec6c545fca Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso Date: Thu, 20 Feb 2020 11:46:04 +0100 Subject: [PATCH] Refresh "Revert "objtool: Fix CONFIG_STACK_VALIDATION=y warning for out-of-tree modules"" for context changes in 4.19.99 --- debian/changelog | 2 ++ ...jtool-fix-config_stack_validation-y-warning.patch | 12 +++++------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 23d50d003..57c110a3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -443,6 +443,8 @@ linux (4.19.99-1) UNRELEASED; urgency=medium * do_last(): fetch directory ->i_mode and ->i_uid before it's too late (CVE-2020-8428) * vfs: fix do_last() regression + * Refresh "Revert "objtool: Fix CONFIG_STACK_VALIDATION=y warning for + out-of-tree modules"" for context changes in 4.19.99 [ Ben Hutchings ] * [x86] Drop "Add a SysRq option to lift kernel lockdown" (Closes: #947021) diff --git a/debian/patches/debian/revert-objtool-fix-config_stack_validation-y-warning.patch b/debian/patches/debian/revert-objtool-fix-config_stack_validation-y-warning.patch index 878e42e2e..0934fa705 100644 --- a/debian/patches/debian/revert-objtool-fix-config_stack_validation-y-warning.patch +++ b/debian/patches/debian/revert-objtool-fix-config_stack_validation-y-warning.patch @@ -10,11 +10,9 @@ a pre-built objtool. Makefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) -Index: linux/Makefile -=================================================================== ---- linux.orig/Makefile -+++ linux/Makefile -@@ -948,17 +948,6 @@ export mod_sign_cmd +--- a/Makefile ++++ b/Makefile +@@ -954,17 +954,6 @@ export mod_sign_cmd HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) @@ -29,10 +27,10 @@ Index: linux/Makefile - endif -endif - + PHONY += prepare0 ifeq ($(KBUILD_EXTMOD),) - core-y += kernel/ certs/ mm/ fs/ ipc/ security/ crypto/ block/ -@@ -1109,6 +1098,17 @@ uapi-asm-generic: +@@ -1115,6 +1104,17 @@ uapi-asm-generic: $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.asm-generic \ src=uapi/asm obj=arch/$(SRCARCH)/include/generated/uapi/asm