lkml.org 
[lkml]   [2019]   [Feb]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.19 20/85] ARM: fix the cockup in the previous patch
    Date
    4.19-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    Commit d6951f582cc50ba0ad22ef46b599740966599b14 upstream.

    The intention in the previous patch was to only place the processor
    tables in the .rodata section if big.Little was being built and we
    wanted the branch target hardening, but instead (due to the way it
    was tested) it ended up always placing the tables into the .rodata
    section.

    Although harmless, let's correct this anyway.

    Fixes: 3a4d0c2172bc ("ARM: ensure that processor vtables is not lost after boot")
    Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
    Signed-off-by: David A. Long <dave.long@linaro.org>
    Reviewed-by: Julien Thierry <julien.thierry@arm.com>
    Tested-by: Julien Thierry <julien.thierry@arm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/mm/proc-macros.S | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
    index 19516fbc2c55..5461d589a1e2 100644
    --- a/arch/arm/mm/proc-macros.S
    +++ b/arch/arm/mm/proc-macros.S
    @@ -278,7 +278,7 @@
    * If we are building for big.Little with branch predictor hardening,
    * we need the processor function tables to remain available after boot.
    */
    -#if 1 // defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR)
    +#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR)
    .section ".rodata"
    #endif
    .type \name\()_processor_functions, #object
    @@ -316,7 +316,7 @@ ENTRY(\name\()_processor_functions)
    .endif

    .size \name\()_processor_functions, . - \name\()_processor_functions
    -#if 1 // defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR)
    +#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR)
    .previous
    #endif
    .endm
    --
    2.19.1


    \
     
     \ /
      Last update: 2019-02-18 15:42    [W:4.153 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site