Received-SPF: pass (google.com: domain of linux-kernel+bounces-25262-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1;
Message-ID: <56b52d4e-9dc0-400c-a141-7e70f5c72afa@siemens.com>
Date: Sat, 13 Jan 2024 11:35:32 +0100
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH] riscv/efistub: Ensure GP-relative addressing is not used
Content-Language: en-US
To: Palmer Dabbelt <palmer@rivosinc.com>, Ard Biesheuvel <ardb@kernel.org>
Cc: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org
References: <mhng-8a4a5f85-faf9-405c-95a0-78cd04ec6509@palmer-ri-x1c9>
From: Jan Kiszka <jan.kiszka@siemens.com>
In-Reply-To: <mhng-8a4a5f85-faf9-405c-95a0-78cd04ec6509@palmer-ri-x1c9>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?Q3dBSWlxRUpqNnl2bTNsMjBXOXBoYTdSS3BHbWNsWldJdi9sYVVTZkY4aUQ1?=
 =?utf-8?B?U3FnNGNSQ1IrV3M2bUF1VzRlcGY0azlPbmpUd2xPOGkrZ1Nyb2taekZZeDlw?=
 =?utf-8?B?cXd2UVlReURjZzdheXEzcGFjMUhFZWlqdWRvb2M2TWRoMkh5VXRlRjQyR1RJ?=
 =?utf-8?B?SGVOcGlVU2g2WXBKOXVzbE1jVS9MSjNoblFXVXMycVRyeHFmOXdsSVltb0h2?=
 =?utf-8?B?d0lBdy85MEQ1dnRWdEsrTk9CUnh6NTlXa2xhSFRSRDM2YzJURkZFM0Uyejdv?=
 =?utf-8?B?YlBpK2Fqam94M0F3SUpqQlVtc0JrTWhTQnRWVFJRczlxNEFpajhqZkhESEVZ?=
 =?utf-8?B?emJuM1ZuNmM4eFB1SUVKNTRFZnh2eDZlVHBiOWw5eWpWYUp4VTNXK1FYVkVS?=
 =?utf-8?B?WGMxalFyNnlqWVRRNlVZWXpFNzcvZ3YvN3hkY0QwWEQvc2lSZml2K2x0ODVN?=
 =?utf-8?B?MVBpZ0tvVDVpbWZ1dTR3MkVqbSt3WDh3UDJvZVRUUHdjYytSam1jZS91WVo5?=
 =?utf-8?B?WExQWFJEYzkxUzJmUVNFa3BGbWlvREk5dHJUekVvODVXR0hpZnNxTFBreXFQ?=
 =?utf-8?B?SDJ5YVpDZ1NSUjRRM3oxWW5wSGxVYUJEb3VoVEVGK1ZCTDA2Z2lWc2ZkLzUr?=
 =?utf-8?B?QWdKR0hleXg3aXZldXZCSXJ6UU5LRzUyUFZhRFdFODN4R21STFNBZmUxS0xz?=
 =?utf-8?B?a2Mxem81L0hSb2h6TVJ0V3h6b0dkNlFIVWxUR2hWS2tEeURRWlFBTG91L3hy?=
 =?utf-8?B?UEU5VitkM1Rna3BBQWczZnFWTE9ZcHNJK3hMWTRnQ3RFdzhHWFhQVkc5WXM3?=
 =?utf-8?B?eVgxWlpISXRhVW9lVGpiYk9kTHVhOHhVdDFwbHJ4WjZGOUdEVnhzUTNyTFpM?=
 =?utf-8?B?QUhDaVlvMTgxWnhxSkVCeFBLV2V6Ump2dGcwQmN1czlyNU04c2hhSitOWExv?=
 =?utf-8?B?VjZGaGFTejhSVWw1RWJzSnlzMmU2MC8wajVpU09qVTBqK1pnbzZRbEpkOHoz?=
 =?utf-8?B?L3V2RGNwbitKcG5IdlM3YkJCak5uWkFRNkNrRjFCaUlLb2xxWWNzVXZYREdN?=
 =?utf-8?B?OWVyZ2kvNDc3N2N5YkxZdGtmNG93eGcrTUVHNW5CWktFdFVNVDdNd2ZYbG1G?=
 =?utf-8?B?WjFYOW0vam4vbEtiOElwRVFRRy9kaDFwbk5zNGR6bHBOUXkvcXhPZkdMaW9t?=
 =?utf-8?B?VWFLSW95cWdveEM3MDFhNmdodFVQZFpiSTFUc0VHMk56cmVFdHlrOENHcWI3?=
 =?utf-8?B?VGFBSkU5L2ExM04xN0puV1cvWVVhRktuQnNtakw2MjVjMGdqUFJPVDdFNzNQ?=
 =?utf-8?B?Nks0bEVLTjlValVlaEJGbWZTcWdDdWUraFQ2Mnd3QmprM0puVzZWZithaVRq?=
 =?utf-8?B?aHZTeTYyN3BCdDU1S1VSb3ZDUXM5blNST0J0RGpDYWw2L0tjeUJGK3BXOFow?=
 =?utf-8?B?UVBHQmR1VG5IeDJxOW1qMGZ0VVpRdXdNZy9VNVhFTkNIRUNUSUFiOGRCRXI3?=
 =?utf-8?B?RFROL0NuNkVWbERmZ29mdXdFNUtQVDhYM3BYY2ozRk93Z1JIK3p3dDdCWWIx?=
 =?utf-8?B?OTdvOEh0L3ZFTUVnMFAzY1U1OE53Um9raVFRMFRNczIyS3NRQUJRZHNndEV3?=
 =?utf-8?B?VVdwVnNDS0RLVlc5bkpEYWRzN05wSmVZVjNrNURkT2UwOWVJNVhFaXczcVhx?=
 =?utf-8?B?OExKbDlYUnJERjVtYjJHRU4zRHo1ZE9id1hobGtXN294ZWo1aVdoZ0dxcFZ2?=
 =?utf-8?B?NGZjZ0xUNmk5UjlqT3BVUE1HeHpkLzRRUDhod25BemJEemdwY0x1bVBodXoz?=
 =?utf-8?B?Mm56RFdRd2VRSi9KQVFlc09TY0IxQ2wxZi94a3hNTnZsVVRac0ptMnMxU3RM?=
 =?utf-8?B?c29MZzdlZ0FaWE5XcTB1WTZramFIR0VNcnpER1Z6bU4wYVJUenFINGVpbUhB?=
 =?utf-8?B?bFR6U0RwVFZzb1l0d1lqdnNQZXRnd2ZSS3FLYmUzUWxGUWNuVWlxSXMycnc2?=
 =?utf-8?B?Qndwa0s0aVIzZC9NTlo4elZTM25xZ2loRzJmdjFhWkQrUzVWT2I4RDZqVUNq?=
 =?utf-8?B?UWUyaDJYenUwRTJBdEtGRGRmUWV4Y1V0eG9aWlI4eFRxTmg2NElxWFljS3ZQ?=
 =?utf-8?B?QW9XN2tVenVGYTM1dU9FZVVYS3dRT0hiNWpERjVEWU16SE9zRldLT3QwSEdI?=
 =?utf-8?B?SVE9PQ==?=
X-OriginatorOrg: siemens.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 3d67fcba-61e9-4320-d481-08dc14236020
X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Jan 2024 10:35:35.0440
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Tc/2krXCZDILL+sFZtHsqI+vD74BzR73P5NWx+U4tLbjFYM+xsRtkVEoEtlHo1JJpTTVVjIdFhcDRrcudLAGqw==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU0PR10MB6250

On 12.01.24 19:56, Palmer Dabbelt wrote:
> On Fri, 12 Jan 2024 10:51:16 PST (-0800), Ard Biesheuvel wrote:
>> Hi Jan,
>>
>> On Fri, 12 Jan 2024 at 19:37, Jan Kiszka <jan.kiszka@siemens.com> wrote:
>>>
>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>
>>> The cflags for the RISC-V efistub were missing -mno-relax, thus were
>>> under the risk that the compiler could use GP-relative addressing. That
>>> happened for _edata with binutils-2.41 and kernel 6.1, causing the
>>> relocation to fail due to an invalid kernel_size in handle_kernel_image.
>>> It was not yet observed with newer versions, but that may just be luck.
>>>
>>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>>> ---
>>>
>>> Something like this should go to stable as well, but we will need
>>> rebased patches.
>>>
>>>  drivers/firmware/efi/libstub/Makefile | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/drivers/firmware/efi/libstub/Makefile
>>> b/drivers/firmware/efi/libstub/Makefile
>>> index 06964a3c130f..d561d7de46a9 100644
>>> --- a/drivers/firmware/efi/libstub/Makefile
>>> +++ b/drivers/firmware/efi/libstub/Makefile
>>> @@ -28,7 +28,7 @@ cflags-$(CONFIG_ARM)          += -DEFI_HAVE_STRLEN
>>> -DEFI_HAVE_STRNLEN \
>>>                                    -DEFI_HAVE_MEMCHR
>>> -DEFI_HAVE_STRRCHR \
>>>                                    -DEFI_HAVE_STRCMP -fno-builtin
>>> -fpic \
>>>                                    $(call
>>> cc-option,-mno-single-pic-base)
>>> -cflags-$(CONFIG_RISCV)         += -fpic -DNO_ALTERNATIVE
>>> +cflags-$(CONFIG_RISCV)         += -fpic -DNO_ALTERNATIVE -mno-relax
>>
>> Can we detect the presence of these references (via the relocation
>> type)? We already do something similar for ordinary absolute
>> references too.
> 
> If there's no `__global_pointer$` symbol then the linker won't make
> GP-relative relaxations (because it doesn't know where GP is).  We
> usually define that symbol in the linker script, but I'm not entierly
> sure how libstub gets its linker script...
> 

The stub seems to be linked together with the rest of the kernel, thus
the regular arch/riscv/kernel/vmlinux.lds.S is used.

Jan

-- 
Siemens AG, Technology
Linux Expert Center