Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Received-SPF: Pass (protection.outlook.com: domain of arm.com designates
 63.35.35.123 as permitted sender) receiver=protection.outlook.com;
 client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com;
Authentication-Results-Original: linaro.org; dkim=none (message not signed)
 header.d=none;linaro.org; dmarc=none action=none header.from=arm.com;
Date:   Fri, 11 Dec 2020 15:33:34 +0000
From:   Szabolcs Nagy <szabolcs.nagy@arm.com>
To:     Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc:     libc-alpha@sourceware.org, Mark Rutland <mark.rutland@arm.com>,
        kernel-hardening@lists.openwall.com,
        Catalin Marinas <catalin.marinas@arm.com>,
        linux-kernel@vger.kernel.org,
        Jeremy Linton <jeremy.linton@arm.com>,
        Mark Brown <broonie@kernel.org>,
        Topi Miettinen <toiwoton@gmail.com>,
        Will Deacon <will@kernel.org>,
        linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH v2 1/6] aarch64: Fix missing BTI protection from
 dependencies [BZ #26926]
Message-ID: <20201211153334.GF24625@arm.com>
References: <cover.1606319495.git.szabolcs.nagy@arm.com>
 <8756cc1083eb4cd93d3766cd39b2f34b6623bbcb.1606319495.git.szabolcs.nagy@arm.com>
 <f077a6d5-082c-c3a5-ce07-71b87a70dc12@linaro.org>
Content-Type: multipart/mixed; boundary="OgqxwSJOaUobr8KG"
Content-Disposition: inline
In-Reply-To: <f077a6d5-082c-c3a5-ce07-71b87a70dc12@linaro.org>
User-Agent: Mutt/1.9.4 (2018-02-28)
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from arm.com (217.140.106.54) by LO2P123CA0052.GBRP123.PROD.OUTLOOK.COM (2603:10a6:600:1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.12 via Frontend Transport; Fri, 11 Dec 2020 15:33:36 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 63389f69-eada-4446-804a-08d89dea2b63
X-MS-TrafficTypeDiagnostic: PR3PR08MB5787:|VI1PR0802MB2399:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <VI1PR0802MB23993D478C52FBE0663DCC57EDCA0@VI1PR0802MB2399.eurprd08.prod.outlook.com>
x-checkrecipientrouted: true
NoDisclaimer: true
X-MS-Oob-TLC-OOBClassifiers: OLM:9508;OLM:9508;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam-Untrusted: BCL:0;
X-Microsoft-Antispam-Message-Info-Original: WyBCQ9Z7JYB7OJVKW/W7Mej6Tp1dRTMpXmTn9GlZGXtQrWpbVgqFxWx2Pgb4hWRX/KwegpA9WA1VPeh0NBTc+P3lRNCsenE1JbRKTc5f3ghKO7XkYKeoaCZ3fG7/FbdvfXJIjffW9Gg1gFHA1Qs/zT0zqaY02asHkYOCt4Bss1tQLPISd4wdyClilcX/bcDtoIY7Pxn/nPBHcUjLGIKgafyFcdVksGIEhp6/J19KuKy1GHZ55aT5AiIGVdcOlb3VU7tr1zopBILrsrqMV5NCWCkJgtyDkuZV0Dfwz5MN/bFB+w1Zek8n1t00YWmxo0zjd2QdDWl3pKw/Pdpmb2M3dlRPKbsHIdJqOE4pTX0xnOrMBLEvJPLwHv4oH/OSaRu2
X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PR3PR08MB5564.eurprd08.prod.outlook.com;PTR:;CAT:NONE;SFS:(4636009)(136003)(376002)(346002)(396003)(39860400002)(366004)(66556008)(86362001)(316002)(66946007)(36756003)(66476007)(66616009)(6916009)(54906003)(33656002)(8886007)(4326008)(44144004)(55016002)(478600001)(2906002)(44832011)(956004)(2616005)(53546011)(33964004)(52116002)(7696005)(1076003)(235185007)(8936002)(5660300002)(8676002)(186003)(16526019)(26005)(2700100001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?utf-8?B?Q0FoUTd4WFpPTzR5NTBjejFXbDF4dERXalNnQWVZY1hEcnpxU2gza2dTeVBq?=
 =?utf-8?B?cTVIYWRKTEVZYklDQ1p6SFhaRG1lZzEzdWoveGY0eDVuamRXR3ZkY1pycE1y?=
 =?utf-8?B?d2txamU2RXM5UUdlL3grblU0ZnU2RmNFNy9hc2hUa1JNaFhHWEIwd2xJSlM0?=
 =?utf-8?B?QVR1S1hyZHpzWWRCc0prMVE1NytVdjdaR2NzRUd4d205Y0g3QW1xUzBrcFJp?=
 =?utf-8?B?MmsvQ1kwY0Z5ck5aeVFRYSt5WEwwc0ozT2QzcWJEeXVTSHhXQkpDMS9oZG5r?=
 =?utf-8?B?anBjdE5GSE01c08wWHVoaWhwMFh1d3BOS09lSWdobXd6M3NHMEJPQTR2N1VZ?=
 =?utf-8?B?NFlUZ1RCRVVCZ0g4d0puNWw5amtEVTJvWGlseDNRRXdSeDRKU2pSQ216a0RW?=
 =?utf-8?B?Ky9WVXVWS3ZjREh0T2NjUnp0SFRMQzhBZHpyOEUra08rN1ZybHNLRk9WTmJX?=
 =?utf-8?B?OVNIRTFjcWI5NS95OGcxRTlVeWlZK0xuV0VhU1BVR3J5RElhRE1yL0ZaTFAy?=
 =?utf-8?B?cGc1TTVSWmdRbHgwU3gzd2MzUVFudlcxU3VKV2IwNFpZc1ZkNTR1OENYMVBp?=
 =?utf-8?B?SnpTUGZDS1U0NURoSllCR254eHd1cXhuYm9MYlBuMEx1NUVpUUlZSXppcXFp?=
 =?utf-8?B?b0tuam02aHRDMDlWUkdrNzJ5Q1FwSHB3Y2RZdmJyUFBMZ2JsY1drUHZNaENF?=
 =?utf-8?B?WGVVYWErU1YwTmVRYWVYanpvMU5XUjZWNmQwUjhZdGVDaXdzZzBOZ1BuTm1m?=
 =?utf-8?B?QktpZ21RNytaRE5wVXk3QlJjVkFORjN4ay9mUThRVVlGWnRSUVV3UllzTHV6?=
 =?utf-8?B?bkh5Q2U0MmZmcDl5MUFCTTdaS1Q0dTZkQWdrYjEvUENXei8zTUhOdEtCZjU4?=
 =?utf-8?B?N2ovdU9zSS9vSkR4c2xrN0FGZ0RFSER0cFZnVlFtaG0ra1pHeFF5dm4yTVNI?=
 =?utf-8?B?eG5OODh2UElRdlp2dmFlOTl3Z3MyQmVXQjZURzhzQzkwcjl0OGVUMUsrd21v?=
 =?utf-8?B?aFQ3NzQwbnIzdlVyelFYQ1d4d3YvQVhvN2JOV0Q2WUFuOXpFNnZYZzAzT0Fk?=
 =?utf-8?B?QjFLRDdsYnRmRnk0TTRpM3M5NVVaRHlaRFlSQlMrVEF5dzVkZzFmQ2pUV3Jm?=
 =?utf-8?B?SEd3SXMzREZEOWMwSTlpanFRcW9OR0YzM2dBTW9kMDNnZGE4cXRkYmRva1Bi?=
 =?utf-8?B?NGxyNnhRRzRVVVhtYzdlMzhUeFlXZlV1Rm1KVW1wNFU1bXJxR3hwekZHODdo?=
 =?utf-8?B?WFJ0eUxDNXhWSzMvKzZLVU5QQ2p2M2l0MEN3UmJNOVF0UENrZGM2dWpaZmJw?=
 =?utf-8?Q?bdaRGF1Nfy2UM1G6eoVx4lLE2W6mc184gi?=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR08MB5787
Original-Authentication-Results: linaro.org; dkim=none (message not signed)
 header.d=none;linaro.org; dmarc=none action=none header.from=arm.com;
X-EOPAttributedMessage: 0
X-MS-Exchange-Transport-CrossTenantHeadersStripped: AM5EUR03FT025.eop-EUR03.prod.protection.outlook.com
X-MS-Office365-Filtering-Correlation-Id-Prvs: f4c32ce0-4f3a-47c2-ccbc-08d89dea20f3
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: XOVXROmvSwXL+J1YIcrBb5c4bWkHdEKF/MXq2+IxRnxL2z6DYOn1prAVOleTe14lJM+/NJQfrtyhRKDgWoRMgctj9VnYrEq0SLHFHgV9/ep5iOu2SU24Fpto2IiILJMctRBHqaDZmxpBqBReaeJLJMlqjQ/6O4cv+wV5tSUiN/JgPRJfYe6pPeFyvnKg3zzI1/qLcr30h3TfAVN/n/Ge0ZrNBX8E+nvDiUBAN+eBG8FbnOfIeEGODmV8NNj8imMDbVXV58MioOiJ4O+uP9r7SuS8hw9vQkVPK69c06QkHV13jikugeP+P5xuHVPVXbb0o+I+Lchq6cMyg+gRT4Bpofvf0pSuctrNbReojLqZPDtmh9Q08yqS51/E4yXjdTfoLCX1NoucdMxqGZo+EVd0VUheWu0m3lsYjmUfpjxEczY=
X-Forefront-Antispam-Report: CIP:63.35.35.123;CTRY:IE;LANG:en;SCL:1;SRV:;IPV:CAL;SFV:NSPM;H:64aa7808-outbound-1.mta.getcheckrecipient.com;PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com;CAT:NONE;SFS:(4636009)(376002)(396003)(136003)(346002)(39860400002)(46966005)(53546011)(44832011)(4326008)(33964004)(44144004)(54906003)(36756003)(7696005)(316002)(235185007)(1076003)(5660300002)(356005)(336012)(8676002)(82740400003)(478600001)(956004)(82310400003)(26005)(81166007)(70206006)(8886007)(6862004)(86362001)(107886003)(2616005)(33656002)(16526019)(66616009)(8936002)(2906002)(186003)(47076004)(55016002)(70586007)(2700100001);DIR:OUT;SFP:1101;
X-OriginatorOrg: arm.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Dec 2020 15:33:54.8054
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 63389f69-eada-4446-804a-08d89dea2b63
X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d;Ip=[63.35.35.123];Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com]
X-MS-Exchange-CrossTenant-AuthSource: AM5EUR03FT025.eop-EUR03.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0802MB2399
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

--OgqxwSJOaUobr8KG
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline

The 12/10/2020 14:51, Adhemerval Zanella wrote:
> On 27/11/2020 10:19, Szabolcs Nagy via Libc-alpha wrote:
> > The _dl_open_check and _rtld_main_check hooks are not called on the
> > dependencies of a loaded module, so BTI protection was missed on
> > every module other than the main executable and directly dlopened
> > libraries.
> > 
> > The fix just iterates over dependencies to enable BTI.
> > 
> > Fixes bug 26926.
> 
> LGTM, modulus the argument name change.
> 
> I also think it would be better to add a testcase, for both DT_NEEDED
> and dlopen case.

thanks, i committed this with fixed argument name as attached.

i plan to do tests later once i understand the BTI semantics
(right now it's not clear if in the presence of some W^X
policy BTI may be silently ignored or not).

--OgqxwSJOaUobr8KG
Content-Type: text/x-diff; charset=utf-8
Content-Disposition: attachment; filename="0001-aarch64-Fix-missing-BTI-protection-from-dependencies.patch"

From 72739c79f61989a76b7dd719f34fcfb7b8eadde9 Mon Sep 17 00:00:00 2001
From: Szabolcs Nagy <szabolcs.nagy@arm.com>
Date: Fri, 20 Nov 2020 15:27:06 +0000
Subject: [PATCH] aarch64: Fix missing BTI protection from dependencies [BZ #26926]

The _dl_open_check and _rtld_main_check hooks are not called on the
dependencies of a loaded module, so BTI protection was missed on
every module other than the main executable and directly dlopened
libraries.

The fix just iterates over dependencies to enable BTI.

Fixes bug 26926.
---
 sysdeps/aarch64/dl-bti.c | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/sysdeps/aarch64/dl-bti.c b/sysdeps/aarch64/dl-bti.c
index 196e462520..56c097210a 100644
--- a/sysdeps/aarch64/dl-bti.c
+++ b/sysdeps/aarch64/dl-bti.c
@@ -51,11 +51,24 @@ enable_bti (struct link_map *map, const char *program)
   return 0;
 }
 
-/* Enable BTI for L if required.  */
+/* Enable BTI for L and its dependencies.  */
 
 void
 _dl_bti_check (struct link_map *l, const char *program)
 {
-  if (GLRO(dl_aarch64_cpu_features).bti && l->l_mach.bti)
+  if (!GLRO(dl_aarch64_cpu_features).bti)
+    return;
+
+  if (l->l_mach.bti)
     enable_bti (l, program);
+
+  unsigned int i = l->l_searchlist.r_nlist;
+  while (i-- > 0)
+    {
+      struct link_map *dep = l->l_initfini[i];
+      if (dep->l_init_called)
+	continue;
+      if (dep->l_mach.bti)
+	enable_bti (dep, program);
+    }
 }
-- 
2.17.1


--OgqxwSJOaUobr8KG--