From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 7F31538582BA; Mon, 5 Feb 2024 19:06:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7F31538582BA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1707159992; bh=Wltt3X4bp7eyW8ccMr4fUmAWdd+QOPpHyXFTO8dTcPw=; h=From:To:Subject:Date:From; b=S/5YwSZduAgm0rEup4scKXVeinWBjduu93Ra39u5SSaP3GspvoIzWstVubwe9QCih wLs6wD5PPi8YDeaNogzh9jiAgLPkHlhrAKY5sxNyxtia5rmxYoaBEaImxdOj5QBAvj LIZgFaltuEPQJCHNfgt6v83V0yEukJdzyz1eMGms= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/release/2.37/master] arm: Remove wrong ldr from _dl_start_user (BZ 31339) X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/release/2.37/master X-Git-Oldrev: 8b849f70b397bae04ddad20ace07561103a8260a X-Git-Newrev: eee7525d35ec16bbe81435e41079ab72519d825c Message-Id: <20240205190632.7F31538582BA@sourceware.org> Date: Mon, 5 Feb 2024 19:06:32 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=eee7525d35ec16bbe81435e41079ab72519d825c commit eee7525d35ec16bbe81435e41079ab72519d825c Author: Adhemerval Zanella Date: Mon Feb 5 16:10:24 2024 +0000 arm: Remove wrong ldr from _dl_start_user (BZ 31339) The commit 49d877a80b29d3002887b084eec6676d9f5fec18 (arm: Remove _dl_skip_args usage) removed the _SKIP_ARGS literal, which was previously loader to r4 on loader _start. However, the cleanup did not remove the following 'ldr r4, [sl, r4]' on _dl_start_user, used to check to skip the arguments after ld self-relocations. In my testing, the kernel initially set r4 to 0, which makes the ldr instruction just read the _GLOBAL_OFFSET_TABLE_. However, since r4 is a callee-saved register; a different runtime might not zero initialize it and thus trigger an invalid memory access. Checked on arm-linux-gnu. Reported-by: Adrian Ratiu Reviewed-by: Szabolcs Nagy (cherry picked from commit 1e25112dc0cb2515d27d8d178b1ecce778a9d37a) Diff: --- sysdeps/arm/dl-machine.h | 1 - 1 file changed, 1 deletion(-) diff --git a/sysdeps/arm/dl-machine.h b/sysdeps/arm/dl-machine.h index d720c02c96..77dc7415e9 100644 --- a/sysdeps/arm/dl-machine.h +++ b/sysdeps/arm/dl-machine.h @@ -137,7 +137,6 @@ _start:\n\ _dl_start_user:\n\ adr r6, .L_GET_GOT\n\ add sl, sl, r6\n\ - ldr r4, [sl, r4]\n\ @ save the entry point in another register\n\ mov r6, r0\n\ @ get the original arg count\n\