linux-kernel - Re: [PATCH v3 30/39] arm64: kasan: Enable TBI EL1

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <59c25256-374e-9a13-8098-1543b1768248@arm.com>
Date:   Fri, 25 Sep 2020 12:47:01 +0100
From:   Vincenzo Frascino <vincenzo.frascino@....com>
To:     Catalin Marinas <catalin.marinas@....com>,
        Andrey Konovalov <andreyknvl@...gle.com>
Cc:     Dmitry Vyukov <dvyukov@...gle.com>, kasan-dev@...glegroups.com,
        Andrey Ryabinin <aryabinin@...tuozzo.com>,
        Alexander Potapenko <glider@...gle.com>,
        Marco Elver <elver@...gle.com>,
        Evgenii Stepanov <eugenis@...gle.com>,
        Elena Petrova <lenaptr@...gle.com>,
        Branislav Rankov <Branislav.Rankov@....com>,
        Kevin Brodsky <kevin.brodsky@....com>,
        Will Deacon <will.deacon@....com>,
        Andrew Morton <akpm@...ux-foundation.org>,
        linux-arm-kernel@...ts.infradead.org, linux-mm@...ck.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3 30/39] arm64: kasan: Enable TBI EL1



On 9/25/20 12:37 PM, Catalin Marinas wrote:
> On Fri, Sep 25, 2020 at 12:50:37AM +0200, Andrey Konovalov wrote:
>> diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
>> index 12ba98bc3b3f..dce06e553c7c 100644
>> --- a/arch/arm64/mm/proc.S
>> +++ b/arch/arm64/mm/proc.S
>> @@ -40,9 +40,13 @@
>>  #define TCR_CACHE_FLAGS	TCR_IRGN_WBWA | TCR_ORGN_WBWA
>>  
>>  #ifdef CONFIG_KASAN_SW_TAGS
>> -#define TCR_KASAN_FLAGS TCR_TBI1
>> +#define TCR_KASAN_SW_FLAGS TCR_TBI1
>>  #else
>> -#define TCR_KASAN_FLAGS 0
>> +#define TCR_KASAN_SW_FLAGS 0
>> +#endif
>> +
>> +#ifdef CONFIG_KASAN_HW_TAGS
>> +#define TCR_KASAN_HW_FLAGS TCR_TBI1
>>  #endif
>>  
>>  /*
>> @@ -454,6 +458,9 @@ SYM_FUNC_START(__cpu_setup)
>>  
>>  	/* set the TCR_EL1 bits */
>>  	orr	mte_tcr, mte_tcr, #SYS_TCR_EL1_TCMA1
>> +#ifdef CONFIG_KASAN_HW_TAGS
>> +	orr	mte_tcr, mte_tcr, #TCR_KASAN_HW_FLAGS
>> +#endif
> 
> I missed this in an earlier patch. Do we need TCMA1 set without
> KASAN_HW? If not, we could add them both to TCR_KASAN_HW_FLAGS.
> 

We don't. I will move the code around in the next version.

-- 
Regards,
Vincenzo