linux-kernel - Re: [PATCH 1/3] MIPS: KASLR: Correcte valid bits in apply_r_mips_26

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] [day] [month] [year] [list]

Message-ID: <0fbbdce0-1449-fb40-0a11-2cded0c3472b@loongson.cn>
Date:   Fri, 20 Nov 2020 10:48:07 +0800
From:   Jinyang He <hejinyang@...ngson.cn>
To:     Thomas Bogendoerfer <tsbogend@...ha.franken.de>
Cc:     Huacai Chen <chenhc@...ote.com>,
        Jiaxun Yang <jiaxun.yang@...goat.com>,
        linux-mips@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH 1/3] MIPS: KASLR: Correcte valid bits in
 apply_r_mips_26_rel

Hi,

On 11/19/2020 08:36 PM, Thomas Bogendoerfer wrote:
> On Thu, Nov 19, 2020 at 10:29:12AM +0800, Jinyang He wrote:
>> Apply_r_mips_26_rel() relocates instructions like j, jal and etc. These
>> instructions consist of 6bits function field and 26bits address field.
>> The value of target_addr as follows,
>> =================================================================
>> |     high 4bits           |            low 28bits              |
>> =================================================================
>> |the high 4bits of this PC | the low 26bits of instructions << 2|
>> =================================================================
>> Thus, loc_orig and log_new both need high 4bits ranther than high 6bits.
> 						  rather
>
>> Replace 0x3ffffff with 0xfffffff.
>>
>> Signed-off-by: Jinyang He <hejinyang@...ngson.cn>
>> ---
>>   arch/mips/kernel/relocate.c | 4 ++--
>>   1 file changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/mips/kernel/relocate.c b/arch/mips/kernel/relocate.c
>> index 3d80a51..709cfa0 100644
>> --- a/arch/mips/kernel/relocate.c
>> +++ b/arch/mips/kernel/relocate.c
>> @@ -95,7 +95,7 @@ static int __init apply_r_mips_26_rel(u32 *loc_orig, u32 *loc_new, long offset)
>>   
>>   	/* Original target address */
>>   	target_addr <<= 2;
>> -	target_addr += (unsigned long)loc_orig & ~0x03ffffff;
>> +	target_addr += (unsigned long)loc_orig & ~0x0fffffff;
> how about using
>
> 	target_addr += (unsigned long)log_orig & 0xf0000000;
>
> which makes it IMHO even clearer what this does ?
That sounds good. I'll send v2 later.

Thanks,
Jinyang.

> Thomas.
>