From 1e1b107b356c97accca0517712dade60527c8c0d Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 7 Oct 2021 08:21:16 +0200 Subject: [PATCH] 4.4-stable patches added patches: revert-arm64-mark-__stack_chk_guard-as-__ro_after_init.patch --- ...__stack_chk_guard-as-__ro_after_init.patch | 34 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 35 insertions(+) create mode 100644 queue-4.4/revert-arm64-mark-__stack_chk_guard-as-__ro_after_init.patch create mode 100644 queue-4.4/series diff --git a/queue-4.4/revert-arm64-mark-__stack_chk_guard-as-__ro_after_init.patch b/queue-4.4/revert-arm64-mark-__stack_chk_guard-as-__ro_after_init.patch new file mode 100644 index 00000000000..5195e9100dc --- /dev/null +++ b/queue-4.4/revert-arm64-mark-__stack_chk_guard-as-__ro_after_init.patch @@ -0,0 +1,34 @@ +From 3bb3b079fe326144883338b8c55eff6bf8a1b6b6 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +Date: Thu, 7 Oct 2021 08:18:59 +0200 +Subject: Revert "arm64: Mark __stack_chk_guard as __ro_after_init" + +From: Greg Kroah-Hartman + +This reverts commit 69e450b170995e8a4e3eb94fb14c822553124870 which is +commit 9fcb2e93f41c07a400885325e7dbdfceba6efaec upstream. + +Turns out to break the build when CONFIG_CC_STACKPROTECTOR=y. + +Reported-by: Hans-Christian Egtvedt +Link: https://lore.kernel.org/r/DM5PR11MB001226B8D03B8CC8FA093AC6DDB09@DM5PR11MB0012.namprd11.prod.outlook.com +Cc: Dan Li +Cc: Mark Rutland +Cc: Catalin Marinas +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman +--- + arch/arm64/kernel/process.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/arch/arm64/kernel/process.c ++++ b/arch/arm64/kernel/process.c +@@ -55,7 +55,7 @@ + + #ifdef CONFIG_CC_STACKPROTECTOR + #include +-unsigned long __stack_chk_guard __ro_after_init; ++unsigned long __stack_chk_guard __read_mostly; + EXPORT_SYMBOL(__stack_chk_guard); + #endif + diff --git a/queue-4.4/series b/queue-4.4/series new file mode 100644 index 00000000000..278b6e6665d --- /dev/null +++ b/queue-4.4/series @@ -0,0 +1 @@ +revert-arm64-mark-__stack_chk_guard-as-__ro_after_init.patch -- 2.47.3