lkml.org 
[lkml]   [2020]   [Dec]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 289/717] arm64: mte: fix prctl(PR_GET_TAGGED_ADDR_CTRL) if TCF0=NONE
    Date
    From: Peter Collingbourne <pcc@google.com>

    [ Upstream commit 929c1f3384d7e5cd319d03242cb925c3f91236f7 ]

    Previously we were always returning a tag inclusion mask of zero via
    PR_GET_TAGGED_ADDR_CTRL if TCF0 was set to NONE. Fix it by making
    the code for the NONE case match the others.

    Signed-off-by: Peter Collingbourne <pcc@google.com>
    Link: https://linux-review.googlesource.com/id/Iefbea66cf7d2b4c80b82f9639b9ea7f33f7fac53
    Fixes: af5ce95282dc ("arm64: mte: Allow user control of the generated random tags via prctl()")
    Reviewed-by: Catalin Marinas <catalin.marinas@arm.com>
    Link: https://lore.kernel.org/r/20201203075110.2781021-1-pcc@google.com
    Signed-off-by: Will Deacon <will@kernel.org>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/kernel/mte.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/arch/arm64/kernel/mte.c b/arch/arm64/kernel/mte.c
    index 52a0638ed967b..ef15c8a2a49dc 100644
    --- a/arch/arm64/kernel/mte.c
    +++ b/arch/arm64/kernel/mte.c
    @@ -189,7 +189,8 @@ long get_mte_ctrl(struct task_struct *task)

    switch (task->thread.sctlr_tcf0) {
    case SCTLR_EL1_TCF0_NONE:
    - return PR_MTE_TCF_NONE;
    + ret |= PR_MTE_TCF_NONE;
    + break;
    case SCTLR_EL1_TCF0_SYNC:
    ret |= PR_MTE_TCF_SYNC;
    break;
    --
    2.27.0


    \
     
     \ /
      Last update: 2020-12-28 15:13    [W:3.117 / U:0.792 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site