Skip to contentSkip to conversation

Patch "ARM: OMAP2+: Fix save_secure_ram_context for rodata" has been added to the 4.4-stable tree

PATCH [email protected] 1 participant 1 message Feb 24, 2016

Subsystems (4)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

ARM: OMAP2+: Fix save_secure_ram_context for rodata

to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
arm-omap2-fix-save_secure_ram_context-for-rodata.patch
and it can be found in the queue-4.4 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From a5311d4d13df80bd71a9e47f9ecaf327f478fab1 Mon Sep 17 00:00:00 2001

From: Tony Lindgren <[email protected]>
Date: Thu, 14 Jan 2016 12:20:47 -0800
Subject: ARM: OMAP2+: Fix save_secure_ram_context for rodata

From: Tony Lindgren <[email protected]>

commit a5311d4d13df80bd71a9e47f9ecaf327f478fab1 upstream.

We don't want to write to .text and we can move save_secure_ram_context into .data as it all gets copied into SRAM anyways.

Cc Kees Cook <[email protected]>
Cc Laura Abbott <[email protected]>
Cc Nishanth Menon <[email protected]>
Cc Richard Woodruff <[email protected]>
Cc Russell King <[email protected]>
Cc Sergei Shtylyov <[email protected]>
Cc Tero Kristo <[email protected]>
Fixes 1e6b48116a95 ("ARM: mm: allow non-text sections to be

non-executable")

---
 arch/arm/mach-omap2/sleep34xx.S |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/sleep34xx.S +8 -2
@@ -92,8 +92,12 @@ ENTRY(enable_omap3630_toggle_l2_on_resto
 	ldmfd	sp!, {pc}	@ restore regs and return
 ENDPROC(enable_omap3630_toggle_l2_on_restore)
 
-	.text
-/* Function to call rom code to save secure ram context */
+/*
+ * Function to call rom code to save secure ram context. This gets
+ * relocated to SRAM, so it can be all in .data section. Otherwise
+ * we need to initialize api_params separately.
+ */
+	.data
 	.align	3
 ENTRY(save_secure_ram_context)
 	stmfd	sp!, {r4 - r11, lr}	@ save registers on stack
@@ -127,6 +131,8 @@ ENDPROC(save_secure_ram_context)
 ENTRY(save_secure_ram_context_sz)
 	.word	. - save_secure_ram_context
 
+	.text
+
 /*
  * ======================
  * == Idle entry point ==

Patches currently in stable-queue which might be from [email protected] are

queue-4.4/phy-twl4030-usb-relase-usb-phy-on-unload.patch queue-4.4/arm-omap2-fix-wait_dll_lock_timed-for-rodata.patch queue-4.4/arm-dts-fix-omap5-pmic-control-lines-for-rtc-writes.patch queue-4.4/arm-omap2-fix-l2_inv_api_params-for-rodata.patch queue-4.4/arm-omap2-fix-ppa_zero_params-and-ppa_por_params-for-rodata.patch queue-4.4/arm-omap2-fix-l2dis_3630-for-rodata.patch queue-4.4/arm-omap2-fix-save_secure_ram_context-for-rodata.patch queue-4.4/phy-twl4030-usb-fix-unbalanced-pm_runtime_enable-on-module-reload.patch queue-4.4/arm-dts-omap5-board-common-enable-rtc-and-charging-of-backup-battery.patch queue-4.4/arm-dts-fix-wl12xx-missing-clocks-that-cause-hangs.patch