Received-SPF: pass (google.com: domain of linux-kernel+bounces-24977-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Message-ID: <42c63cb9-87d0-49db-9af8-95771b186684@siemens.com>
Date: Fri, 12 Jan 2024 19:37:29 +0100
User-Agent: Mozilla Thunderbird
From: Jan Kiszka <jan.kiszka@siemens.com>
Subject: [PATCH] riscv/efistub: Ensure GP-relative addressing is not used
Content-Language: en-US
To: Ard Biesheuvel <ardb@kernel.org>, Palmer Dabbelt <palmer@rivosinc.com>
Cc: linux-efi <linux-efi@vger.kernel.org>,
 Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0:
	=?utf-8?B?QU9zZTRscERuR05BcTkwUy9EN1FjRGNLVFQ1MkVNNUp6bk1valdGZkdnUEQ5?=
 =?utf-8?B?dzNJVFpNb2pjL3dTVzZjejZQOXp4VzAvaFl6MkJCbU1QelZES2phb1MrRk92?=
 =?utf-8?B?dS9hYnRnbG1TMlVqTVlRRUg0bHNCcnpqQVZ4RXFicWJTVFJYbEFpZ3QySjYr?=
 =?utf-8?B?M294UHQxdVowZjQ1anN5R2hBZ0x2TnlLeFlsSlR5bnpoZ3RpbGhhd3VwYjUy?=
 =?utf-8?B?Qmh5NlBUUUtJZFFBckQrWGVWWm1LR3NRSVpDd0MwR1hPZ1Jna0xoWi9mbjl6?=
 =?utf-8?B?Rys4NHVNWVNiUmdFbHQyTjI0aWNyVkdwY3VFQTJkZFpVTkp4OU5iQi9qM29i?=
 =?utf-8?B?Zjd1M3NJRUU4TTZYMi9aQ3JuNCtiN1Z3VEUzSksxNU1DaXhOT1Q5VE9yenJE?=
 =?utf-8?B?dWJVOXo4R2FOY0tKN3dwOXlhT3ZEZGV2TDNidUt1Z011R3BUcFVjVEZ3b04y?=
 =?utf-8?B?M3lCbVRkbGdLMThaT3pLNWZ0ZWFDeEF2WUpCcEVnY2J4aTlYTXd1aWhuMEVQ?=
 =?utf-8?B?U2llWFR4b0JKWDUyTnp0STZTakhKeXp2M1o4MDVwMGl6YWhKUGdIeXRiQy9N?=
 =?utf-8?B?MGF5T0ZjTnE0ODN3N2VET28yUEJFR3FFWGtpWWpQbVhpR0FCTGNiRUFYc2Vh?=
 =?utf-8?B?N040RGN5Z2xMb0xYU0ZFMmxab1N0aXErQXMyWWcxWmc5QXNadUhNb3dCMjBw?=
 =?utf-8?B?c0M0N3g3MGpLYmszZHJVcWROM2VCMjB5VXFISndNc0tzMyt1Q25wUW1iVzRl?=
 =?utf-8?B?T3l1L09ROTBUYnFXQ3FEZVlrNXF6OFdTeWR1UEQ1UVVjcWlHb2Q3Mk5ydzdS?=
 =?utf-8?B?OVJqbVdZcFd4dDhEQWR6dzNsWDZ5ekZMYmRJMHk1ejIzeHh6LzczVDhKZVVm?=
 =?utf-8?B?L1U3ajE0SGMwTGZRR0R5b1BYaXFTblY0cno1a3RuR0RuaUZUM3JZb3VTQy9W?=
 =?utf-8?B?Nko3aU5DRGR1a2xsczBaNldoVlhKOGZIY1JqK2Zqeis4enhGSDAwaWpVQWli?=
 =?utf-8?B?ZlFqTHQ0M1NsZzY2QUpLcWR1TjJtY2RqSWFzTmJYaU1JQWlVNGRCazJ3Q1pm?=
 =?utf-8?B?VU1wd0FBQ29pTWJxOHFHanhqY0dhSnpRUjdBZ0ZrVUJQdjVZVGoxTi8xeW9W?=
 =?utf-8?B?dW9ySnZEak91b0hMMFg5Q2pMQloxcjdtamxaYmZzdmVWMHEySXM0QlExa2pQ?=
 =?utf-8?B?VDlFVml3M0dhRHM5R3hCeE91aXBXZU1rQkhEZGM2MXFGM0g4WXZKeHpmV0hN?=
 =?utf-8?B?WmtJeHByUXRZSEpzR3lsbm40SEk1bG9JS3hvb01BNzlmdzRzWEh3QkE1WUtr?=
 =?utf-8?B?blU4ditIK0J5RkJkT0laUzdSVHBHZFMyMkpQRCs5QWt1SGVqMWhjb0hxbXhW?=
 =?utf-8?B?c0RXcUNHUitNY3UwNkFVbzAxUis5ait2bnc5Ymo4SG5CaXRaQnlXdSswVmox?=
 =?utf-8?B?L09OK0xPcTlSZG1DWGtaSTZPdVBld2JqeGovb0p6SDhheUo4TWtpa0Y3ZmRD?=
 =?utf-8?B?RHU1NkVjMjdXOTlHeDA5OWpCc0o5TDRZdUg4MlZneENWQnNaNnNLeXVRUWVn?=
 =?utf-8?B?NmRFajB1TjZyZC94dUQzK1dHdTIxNlVBMjFjQmFoVk5yV2RFOWh2WTZWRnlU?=
 =?utf-8?B?UFVDVXc3eGpGZVFidXZFLytGYkQ5amtRTW5CSjE0VC8weUlHRzZBVUpwZ2FT?=
 =?utf-8?B?Q3dpRE5xWVRtU0ZwYXpwemhtdlhDM2RMWWgzMzRMWVRkOUM0QmFEeURFR3lZ?=
 =?utf-8?B?V0JWOVY5alYrSjFINm5VTlZ5T0wxN3paYmRYVlJvUFFKdHNkZTQ4MlRiQVJi?=
 =?utf-8?B?bW5oMERlS2tKRXBscEppZWZsdURDWHJ2T3ZtOXNmNXRGS2cxWEFnUG0wTDl3?=
 =?utf-8?B?SE12WWRvL29CL0RUeTJ2ZE53T1RuN3VUMmQ1SEpXYldoZnNsTVB3MzlKbXJy?=
 =?utf-8?B?ZHRjTW9JNzVreGhHS2ZTRlZKSDZzaDR1VG0wTFBIWHJ2UHpTRVFkOEpwSzRu?=
 =?utf-8?B?QkZ0QjU5MzEzTllHODYxeHNOaXU1dHRrWTVRRmRsREpnU1haejM2MGtBVHEy?=
 =?utf-8?B?cnIvL2FyMGJpREMzRkczbUdvbXV1cHhwR3FzeDF0WGc1ZkNFalNZM29RWjBi?=
 =?utf-8?Q?lOsAEuqF8gOOok4hxYw4dp6A5?=
X-OriginatorOrg: siemens.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 4e87843f-fdae-4d8c-2374-08dc139d8a8f
X-MS-Exchange-CrossTenant-AuthSource: AS4PR10MB6181.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Jan 2024 18:37:33.6084
 (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: lq62neP7DPeyr8A/pFG4K0mpD0EqPSd2gpk6aj6MHLOxooJ/gUhmv5XVWZ64b9aRU7iGZ82xDkvLBeS5o58wNg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR10MB6890

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
 cflags-$(CONFIG_LOONGARCH)	+= -fpie
 
 cflags-$(CONFIG_EFI_PARAMS_FROM_FDT)	+= -I$(srctree)/scripts/dtc/libfdt
-- 
2.35.3