From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05on2062.outbound.protection.outlook.com [40.107.21.62]) by sourceware.org (Postfix) with ESMTPS id 6F8643850418 for ; Thu, 21 Jan 2021 10:45:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 6F8643850418 Received: from DU2PR04CA0138.eurprd04.prod.outlook.com (2603:10a6:10:231::23) by VI1PR08MB4111.eurprd08.prod.outlook.com (2603:10a6:803:ed::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10; Thu, 21 Jan 2021 10:45:28 +0000 Received: from DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:231:cafe::65) by DU2PR04CA0138.outlook.office365.com (2603:10a6:10:231::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Thu, 21 Jan 2021 10:45:28 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; sourceware.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;sourceware.org; dmarc=pass action=none header.from=arm.com; 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; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT012.mail.protection.outlook.com (10.152.20.161) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.11 via Frontend Transport; Thu, 21 Jan 2021 10:45:28 +0000 Received: ("Tessian outbound 2b57fdd78668:v71"); Thu, 21 Jan 2021 10:45:28 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: e8262f4d81cdfebd X-CR-MTA-TID: 64aa7808 Received: from e6339d171a5a.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 6D220B9E-2D7B-4FFA-B5D7-2C78B4270EBC.1; Thu, 21 Jan 2021 10:45:22 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id e6339d171a5a.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 21 Jan 2021 10:45:22 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E5VpMvQ85bHaHLfMDBLUPi4rVX5r/PxANdPy/j2zAvrIR/vm//MNa0HCnCaNPdTe7Ew+n+p1+NCeEKTKADgHH+fJJ132DHqkESRJaxSWg9AZvyhYJWmxdjNScU5apaYFfY/1LpJdmewmPrKGhitilZxI41v0ggqKEwlukPJDzw6bkqYmqeE9F0u/L3XUbB/pW/r0lnx0cZZNM4uqzdvh7WMqQ9jFop/X9UluZ6niJ1hQPPzHFph6aop16thmRDt5zcVk2135ub/qYNx7gAgHHl5sXItblyCTovxvsUX7DFjI2Ncyic36KOZlsLIIYJS/DhfWuJf8dy28LG3t5EX//w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ICKzSgPEC23yxT97eTreKj+gGWQoQJblzWD+2lT6TJA=; b=SzyRjB/r21RD1FlmMw8WeJv28r4/2T/hPBo/nrq+6IRtZxXpe6fEeiGP+/sUaHK5iuTVQvNqMToZ2DSSMhGAnpNkY5A7aSvfbaXgW5FhvJYUPgQ5JJgzklPhKgxwFVgkV+Zrtlgia6X5iUu5Q56r+xbPUb5mD33T/eg66mJWPUTo+/+7ebrGI2+O23HsanZ4psRuC/AXTxZ0/mslcZ+xwFjjf7VeN6sabtsA75VOllCMW4OjnMCDasyI86vLmZUNURgV7kG4LuMAWcl+oC1+fcRGfqoEp4+gWZ74/lkjHtvDiQoeHg0BuxKdzvlexh7Voq7pzsh+KB+A3K7DkccT9g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none Authentication-Results-Original: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=arm.com; Received: from PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) by PR3PR08MB5753.eurprd08.prod.outlook.com (2603:10a6:102:87::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3763.10; Thu, 21 Jan 2021 10:45:21 +0000 Received: from PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::700f:ddbe:a347:ee4f]) by PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::700f:ddbe:a347:ee4f%7]) with mapi id 15.20.3763.014; Thu, 21 Jan 2021 10:45:21 +0000 From: Szabolcs Nagy To: libc-stable@sourceware.org Subject: [2.32 COMMITTED 4/5] elf: Pass the fd to note processing Date: Thu, 21 Jan 2021 10:45:15 +0000 Message-Id: <20210121104515.21352-1-szabolcs.nagy@arm.com> X-Mailer: git-send-email 2.17.1 Content-Type: text/plain X-Originating-IP: [217.140.106.55] X-ClientProxiedBy: LO2P265CA0461.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a2::17) To PA4PR08MB6320.eurprd08.prod.outlook.com (2603:10a6:102:e5::9) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from localhost.localdomain (217.140.106.55) by LO2P265CA0461.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:a2::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3784.12 via Frontend Transport; Thu, 21 Jan 2021 10:45:21 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 16410ed6-0bb0-4517-1aa4-08d8bdf9aab7 X-MS-TrafficTypeDiagnostic: PR3PR08MB5753:|VI1PR08MB4111: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:3383;OLM:3383; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: csWyLierJcfZcVZf5d8wAwFcMOy3il/t2Y3zN6NK967FNG/bh4iN3W3+m5tbVFKXZY2WM5A4ApAhPWK3yOdDWtfqUx5KF0b7mElPx+7o4bTkIn0jmWF69Ma99Zu2oUE9vsEm/YlkqEQ8OW65fyR47aPuBiwkPQVZW0haAXlxqJyoChbRwca7HOTVONlGaIzsoWxxYs1Y/kuDsgNopxm/QqBDiqvYd//zsBHEwDfdFmQqUQLcHb9ycEmehPtqGQq8JYNk3EN+ADdM4ouu2tfQqdoTqOe4reVUhSccZiLZkaWDLjFaDvQxuka6xz/uDZwepvCgtGjVW1VjqXLhHzZVtRAAFnyfKu/amYOxVXcCufDD2UVM7AVuC6ugM8Z2ilJDL48NU8QZD9dDZ4UoDChk9e+51Z357cBR1jb/FDKiEYUvqAYaQqRMJvDt4FaN1sy9yBI8MyauUIHxFdNYOyqtpvp8C+Du+NM1nsRPbs5LFGKIyuhtQCrPzGtlIDNHi+NR7Ib7gx8P0zjfpADk7W2dOJWhNnRPZ7kClPsebHmFP9dSrva/RCKTJXTYeAAc6YFACYOMX2rsAGjsuAGTKtPs2g== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:PA4PR08MB6320.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(39860400002)(366004)(376002)(346002)(136003)(69590400011)(1076003)(5660300002)(6506007)(44832011)(478600001)(6512007)(66946007)(36756003)(26005)(6916009)(66476007)(86362001)(956004)(186003)(52116002)(316002)(16526019)(2616005)(6666004)(8936002)(2906002)(8676002)(83380400001)(66556008)(6486002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?LT8VUCumXLrUcyiBo1EHVEVHZe5tgTPBleRUa3GqWSy7MwFjUql7JHBGUfCG?= =?us-ascii?Q?169+skg8Vz0nLoJGJB8bVQFLZ3aWi703Xbxv3fGm+EyGrku2xoYbFdUDgETV?= =?us-ascii?Q?a9neRQ2WkAL2nKTD6/yZnZWMRlVwoLiYVmk4n32ylLVCWHV6Dqg5ZkcPv50y?= =?us-ascii?Q?V3VNkN35q0ndezhExtblX5w5iqXPJGP/ycKEkvSL2zBYJL/5h81QmhCTbsoA?= =?us-ascii?Q?VVQ4wM7HjNnZFC8rZbIPudpMreUAkY/fMJANAL3FGvEwXGru0nj/GOmMBFRM?= =?us-ascii?Q?AwOfwaKAmHQ5ZjO0ZhZYFp4A+PStDO/WQRd9WmrAQQV6/XzkMV1UNLtHiXuB?= =?us-ascii?Q?JrXS+hdUB+dmaVWFj5+JpxZHkawsqz5zBH+373zJs3CPrLMq+ydJUkBFc6Kh?= =?us-ascii?Q?94ErgIDNg0FMTea6KfcD/mZUVQpJhvB8RstWoH8N2A8cowbTbBgWhcpL5FJc?= =?us-ascii?Q?CfYNY6XSMeWcGxHgMeei6TOSCuHbonUdzfajKkQY0wW5fBg0lGwDl2w3UeiF?= =?us-ascii?Q?oIjNcKO/maqadduQTe07iFUWX1MpAasT4vU+XJLNGtFpRAzOWlwu1sQjR5vU?= =?us-ascii?Q?/obxnRE0iUwc4K4CwuPGtLO0zA5CyYdb9CWTEOyzpgRLPqlYuPgsbdRo9iQ5?= =?us-ascii?Q?0LB+VtTzX+mxcEVHQp8cWYc7lUVquNN1N6uWqRFEm0M888ujETuCWZJDM7Y4?= =?us-ascii?Q?rjrs2CBfeiMZDYkyCC1UgACCRSrNqbeV8TUHrgUe/s3ekCf78z89cR2U+bvN?= =?us-ascii?Q?3kqjbHmNtbWWEVrKsEHwoiytNP3Lyt5InS7a6PK77kFrgd2mxa0OWmqP15Kx?= =?us-ascii?Q?kol5ddi8uVLmK5b11NbyCaF2KLJO5ZXknRR4U+3VlRHt+ykDlcgzbu7gjg39?= =?us-ascii?Q?sXEAhj0pxOmmlLo2au256kwGmduhaP3F5PxXWVS60bP8clF0ME3A9gAf69IX?= =?us-ascii?Q?gd6lDgxBcAg1ohRENSSiAsDPh3duBBadoLdQBW+dr2xQqor07vnpW5wk2PHM?= =?us-ascii?Q?wD8v?= X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR08MB5753 Original-Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none; sourceware.org; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: 7ab1753a-2f2c-4fb3-e5e5-08d8bdf9a680 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: lVmSEPq5jMfzTvWCdGhb6jC61LLq/LmbCztXMG4/wGaqVFxiP/+4TICanwQdJnBGeeZ55EY27G/PAklCzAZXuR9YMG/50lQQThEaAIFN7Z86FZWeSy8BPkPQWGV6WtLhum/6Vg9X7E1vmx0TBbNQykZnkJbOf3zKQU7s59qi5uYl03dbq4b5WhQ1IEpQ05jTnuZPI1Aj9MQm1oyDviuCNrDQBaUhl7O41D1/ej24VDrLeXFBpOQALTVHSaoZvjw2UqtSa8Cx5IE+MByRvEm4ekLDsExKz9lT1mbVkDwJVahx/zKlonAsHExwMZ1xJQF418SJygeeluFwEqfXNhGiugDbfbhvQ7OoJ1g7NfISnJcZiMnAWkVmZjhb/mbQa7hLNOj029piuc0JpRqP/ohIuTmKYhXICWquJLu95h+m2V3HMDtdOCWJjkdHLeB11c6qwDAXTDcKF+DuV7DB14lsp/2Sb5umm8g/put0ADzgivS0N2Kf5urVYhSyKCGh42OY 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)(136003)(376002)(346002)(39860400002)(396003)(46966006)(2616005)(6916009)(478600001)(186003)(69590400011)(86362001)(16526019)(82740400003)(316002)(6512007)(6666004)(1076003)(8676002)(44832011)(6506007)(82310400003)(83380400001)(336012)(5660300002)(70206006)(70586007)(26005)(8936002)(47076005)(356005)(36756003)(6486002)(2906002)(81166007)(956004); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Jan 2021 10:45:28.1487 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 16410ed6-0bb0-4517-1aa4-08d8bdf9aab7 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: DB5EUR03FT012.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4111 X-Spam-Status: No, score=-14.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, MSGID_FROM_MTA_HEADER, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_PASS, TXREP, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-stable@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-stable mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jan 2021 10:45:32 -0000 To handle GNU property notes on aarch64 some segments need to be mmaped again, so the fd of the loaded ELF module is needed. When the fd is not available (kernel loaded modules), then -1 is passed. The fd is passed to both _dl_process_pt_gnu_property and _dl_process_pt_note for consistency. Target specific note processing functions are updated accordingly. Reviewed-by: Adhemerval Zanella (cherry picked from commit c00452d7757a300931ee186d043c43b48eeb0875) --- elf/dl-load.c | 12 +++++++----- elf/rtld.c | 4 ++-- sysdeps/aarch64/dl-prop.h | 6 +++--- sysdeps/generic/dl-prop.h | 6 +++--- sysdeps/generic/ldsodefs.h | 5 +++-- sysdeps/x86/dl-prop.h | 6 +++--- 6 files changed, 21 insertions(+), 18 deletions(-) diff --git a/elf/dl-load.c b/elf/dl-load.c index 9ef1cc3203..71867e7c1a 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -855,10 +855,12 @@ lose (int code, int fd, const char *name, char *realname, struct link_map *l, /* Process PT_GNU_PROPERTY program header PH in module L after PT_LOAD segments are mapped. Only one NT_GNU_PROPERTY_TYPE_0 - note is handled which contains processor specific properties. */ + note is handled which contains processor specific properties. + FD is -1 for the kernel mapped main executable otherwise it is + the fd used for loading module L. */ void -_dl_process_pt_gnu_property (struct link_map *l, const ElfW(Phdr) *ph) +_dl_process_pt_gnu_property (struct link_map *l, int fd, const ElfW(Phdr) *ph) { const ElfW(Nhdr) *note = (const void *) (ph->p_vaddr + l->l_addr); const ElfW(Addr) size = ph->p_memsz; @@ -905,7 +907,7 @@ _dl_process_pt_gnu_property (struct link_map *l, const ElfW(Phdr) *ph) last_type = type; /* Target specific property processing. */ - if (_dl_process_gnu_property (l, type, datasz, ptr) == 0) + if (_dl_process_gnu_property (l, fd, type, datasz, ptr) == 0) return; /* Check the next property item. */ @@ -1370,10 +1372,10 @@ cannot enable executable stack as shared object requires"); switch (ph[-1].p_type) { case PT_NOTE: - _dl_process_pt_note (l, &ph[-1]); + _dl_process_pt_note (l, fd, &ph[-1]); break; case PT_GNU_PROPERTY: - _dl_process_pt_gnu_property (l, &ph[-1]); + _dl_process_pt_gnu_property (l, fd, &ph[-1]); break; } diff --git a/elf/rtld.c b/elf/rtld.c index 5b882163fa..14a42ed00a 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1534,10 +1534,10 @@ of this helper program; chances are you did not intend to run this program.\n\ switch (ph[-1].p_type) { case PT_NOTE: - _dl_process_pt_note (main_map, &ph[-1]); + _dl_process_pt_note (main_map, -1, &ph[-1]); break; case PT_GNU_PROPERTY: - _dl_process_pt_gnu_property (main_map, &ph[-1]); + _dl_process_pt_gnu_property (main_map, -1, &ph[-1]); break; } diff --git a/sysdeps/aarch64/dl-prop.h b/sysdeps/aarch64/dl-prop.h index b0785bda83..2016d1472e 100644 --- a/sysdeps/aarch64/dl-prop.h +++ b/sysdeps/aarch64/dl-prop.h @@ -35,13 +35,13 @@ _dl_open_check (struct link_map *m) } static inline void __attribute__ ((always_inline)) -_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph) +_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph) { } static inline int -_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz, - void *data) +_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type, + uint32_t datasz, void *data) { if (type == GNU_PROPERTY_AARCH64_FEATURE_1_AND) { diff --git a/sysdeps/generic/dl-prop.h b/sysdeps/generic/dl-prop.h index f1cf576fe3..df27ff8e6a 100644 --- a/sysdeps/generic/dl-prop.h +++ b/sysdeps/generic/dl-prop.h @@ -37,15 +37,15 @@ _dl_open_check (struct link_map *m) } static inline void __attribute__ ((always_inline)) -_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph) +_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph) { } /* Called for each property in the NT_GNU_PROPERTY_TYPE_0 note of L, processing of the properties continues until this returns 0. */ static inline int __attribute__ ((always_inline)) -_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz, - void *data) +_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type, + uint32_t datasz, void *data) { return 0; } diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h index ba114ab4b1..62ac40d81b 100644 --- a/sysdeps/generic/ldsodefs.h +++ b/sysdeps/generic/ldsodefs.h @@ -919,8 +919,9 @@ extern void _dl_rtld_di_serinfo (struct link_map *loader, Dl_serinfo *si, bool counting); /* Process PT_GNU_PROPERTY program header PH in module L after - PT_LOAD segments are mapped. */ -void _dl_process_pt_gnu_property (struct link_map *l, const ElfW(Phdr) *ph); + PT_LOAD segments are mapped from file FD. */ +void _dl_process_pt_gnu_property (struct link_map *l, int fd, + const ElfW(Phdr) *ph); /* Search loaded objects' symbol tables for a definition of the symbol diff --git a/sysdeps/x86/dl-prop.h b/sysdeps/x86/dl-prop.h index 89911e19e2..4eb3b85a7b 100644 --- a/sysdeps/x86/dl-prop.h +++ b/sysdeps/x86/dl-prop.h @@ -145,15 +145,15 @@ _dl_process_cet_property_note (struct link_map *l, } static inline void __attribute__ ((unused)) -_dl_process_pt_note (struct link_map *l, const ElfW(Phdr) *ph) +_dl_process_pt_note (struct link_map *l, int fd, const ElfW(Phdr) *ph) { const ElfW(Nhdr) *note = (const void *) (ph->p_vaddr + l->l_addr); _dl_process_cet_property_note (l, note, ph->p_memsz, ph->p_align); } static inline int __attribute__ ((always_inline)) -_dl_process_gnu_property (struct link_map *l, uint32_t type, uint32_t datasz, - void *data) +_dl_process_gnu_property (struct link_map *l, int fd, uint32_t type, + uint32_t datasz, void *data) { return 0; } -- 2.17.1