From patchwork Mon Feb 15 12:08:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Szabolcs Nagy X-Patchwork-Id: 1440500 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=libc-alpha-bounces@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.a=rsa-sha256 header.s=default header.b=Kb5RkPb2; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DfNFF24yDz9sRR for ; Mon, 15 Feb 2021 23:09:21 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5BDBD3950429; Mon, 15 Feb 2021 12:09:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5BDBD3950429 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1613390958; bh=1vWMawxAfYu/mGS2v/onZpQHKpu8G2Ho6p0cQUO5p10=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=Kb5RkPb2LUvYGm1MqVJENBi4wHw6XAb7uYxdHYEJ5aoACUM4FAhhPNmrcrZ7x9ZLh /c0ylcEb92ghxOGbW8wtrOYcJPKjPpSFpK1Hh0rrpMo32gP4+mRfRgBucu2KZYviBP CJI5gTQmao2kTzXfEA+8o0SGo2W4V/hfSLq1FI4o= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80082.outbound.protection.outlook.com [40.107.8.82]) by sourceware.org (Postfix) with ESMTPS id BBCEF3861010 for ; Mon, 15 Feb 2021 12:09:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org BBCEF3861010 Received: from DB9PR06CA0006.eurprd06.prod.outlook.com (2603:10a6:10:1db::11) by AS8PR08MB6438.eurprd08.prod.outlook.com (2603:10a6:20b:33e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.27; Mon, 15 Feb 2021 12:09:12 +0000 Received: from DB5EUR03FT017.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:1db:cafe::f) by DB9PR06CA0006.outlook.office365.com (2603:10a6:10:1db::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.26 via Frontend Transport; Mon, 15 Feb 2021 12:09:12 +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 DB5EUR03FT017.mail.protection.outlook.com (10.152.20.114) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.25 via Frontend Transport; Mon, 15 Feb 2021 12:09:12 +0000 Received: ("Tessian outbound 2b57fdd78668:v71"); Mon, 15 Feb 2021 12:09:12 +0000 X-CheckRecipientChecked: true X-CR-MTA-CID: c18391c7ea2774e3 X-CR-MTA-TID: 64aa7808 Received: from 6641c4e04208.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id FB34E6A4-7B1E-4D1A-B3A0-DD3B3100BDF7.1; Mon, 15 Feb 2021 12:09:06 +0000 Received: from EUR05-DB8-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 6641c4e04208.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Mon, 15 Feb 2021 12:09:06 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jhmSMmuk2+oWAspf1CSkurhwarSIv1x9zC65kSY3Nw7VFcjQVA5pSyvnNzT7TbLLFzFBUGrWdhu8lVlSBwhCbFQ7SdG8SnRKFIcjuiW8ZdWO5zx19JeE6NACejNo9afS/p07iCsZNMZhigQGix+d1Lq3fVXA4WkzLDNi0yOKSQQ67OPy2QZAfTOF+uQBwwYsL22orPXl0Vc1H/5d6rUZq4cu6FB0BSb9aeyZ/PBbnXPLy//WcUoW2Y5wIdgGU+J+xY4ZwhDisgb+p5TtISdgZ/O3WVmW9jJHhK+lubzQKJaE0aowDs9vtrn4TSbO+aWHusPVgsCfdX0ys9l0dH3riw== 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=1vWMawxAfYu/mGS2v/onZpQHKpu8G2Ho6p0cQUO5p10=; b=QYhEzSyBdUL7j2vfd8x9VM6XOsthi0y380q6QGXekmv8jI0u/+XMS8iZiflNKl+eXxwD9puL1/2E06TjuT0qQF7h9968cPmYNiinyNAnm2mGHnDNc1QEjpWANOuRERtWlb1cej2brpM0v+GUESeJKszn6w1ATis2SN72h7IO/3CCY89pAZsxoYCfYdLJ73TVAi6BrwCh916XeCO7sn0da8n6jdZZNAoJiKdLWF+/9PFT6dUipEu8RmoMTh/388e1xaBdV80nwK8Nwu3ALlrazFQTuJrEpCfooqdbDXdSDSwXlgRnT98A+CbO0RIm8oZLNH/7j/KraocQIy6ssR7EhA== 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 PA4PR08MB6286.eurprd08.prod.outlook.com (2603:10a6:102:f2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.26; Mon, 15 Feb 2021 12:09:05 +0000 Received: from PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::60f0:3773:69b8:e336]) by PA4PR08MB6320.eurprd08.prod.outlook.com ([fe80::60f0:3773:69b8:e336%2]) with mapi id 15.20.3846.042; Mon, 15 Feb 2021 12:09:05 +0000 To: libc-alpha@sourceware.org Subject: [PATCH 06/15] elf: Fix comments and logic in _dl_add_to_slotinfo Date: Mon, 15 Feb 2021 12:08:59 +0000 Message-Id: X-Mailer: git-send-email 2.17.1 In-Reply-To: References: X-Originating-IP: [217.140.106.49] X-ClientProxiedBy: LO2P265CA0338.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:d::14) 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.49) by LO2P265CA0338.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:d::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3846.36 via Frontend Transport; Mon, 15 Feb 2021 12:09:04 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 17ab58cd-e4ce-4aa5-08cb-08d8d1aa8193 X-MS-TrafficTypeDiagnostic: PA4PR08MB6286:|AS8PR08MB6438: X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true NoDisclaimer: true X-MS-Oob-TLC-OOBClassifiers: OLM:2887;OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: G43mfzM+GvWyv2cjSKuUJJVzxzqSzE5t/PLXBz117t/SCoPrnIJw6gl0OHziiZsJ2jytaI/knVzx8PrWoH1aT4YTCVj0in7A+yABrXP29lSTHcHAiwaWwB5Gd4uOwyhguWssl73XyNq1dp+LJ4cRBm83dwYI/wSF2b8LXBMda9HJb8dgPempzNTg9YS2cD5NmFVRTem79/d1QOGWfNKH7zgRjvv2HFwdsDh97NdORRJLPXuogdZjajEhHrGQAsGo+fbzqLm/PUkTPVMlpzasEMgAH6F0/AaMo2qmy0vVdipJiiy0InbXLe9rYiomDBnZe6hJBaligU+o60PTgoXTjxh6Ry0ilqflY2qy9/CqrgGaiCaATwtjXR7yJ03+QU4jVQ8GwFDTQ7WhptrDozJyK9d5ShpayS6novaRNTBL57siZqLa1wZwaKZ84sLziO5cGYoD2SWAwrTLKfuk1dk9EZvgx9o7CYerwT1FMNrYVRYi6/pdyc+vLQ06u0VIZ1nyND1ebaRzmU7b7B60SZGPhuFA1T1UZEx/GT+UU473tGZvphAzFKmMJbOtcP+EiNJrPxqBcDConV/N/yWHVjbCtw== 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)(39850400004)(346002)(376002)(396003)(366004)(136003)(52116002)(316002)(5660300002)(86362001)(6512007)(44832011)(6486002)(6916009)(6666004)(26005)(16526019)(66476007)(83380400001)(66556008)(69590400012)(66946007)(186003)(36756003)(6506007)(2906002)(2616005)(478600001)(956004)(8676002)(8936002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData: RTX5gZMhtnreQh2NLYvmF6omoqk+mulSVn05zr7Tfy6B5hOGokchmfj8i1wQeNX3jsvxZfeG6sMLvxZWLcmkoY73IMKw13Mlkc+qtCRSA5XLH7JSmpx+boiUogmDL/ETeRvHylOTfXWlcebC0gWNpaLbIrE5Wnd1iNvH5+Rj52B9PC+wFBypVnvsa2T0uNOivkcro8SJWD2qPYqXuPXVjMwCM/q768za4oe7QcJjw/EILepMO8lkToI4NgDo3L/NIlzGDtWrjHtqclI+IPbCkkYh8bnxNAiZ1lwP3nE3dHxbsXkE8vPxhYoVKGN9eCaZWqSq2VUNWNmH+AJTupDI0qgeb01tVm/xCN+X/sG0OcFBJv7PHViOZ5b6HtYF4NbbsUKJon8NCZ0YYLI2unRZU2YwYr2mp/9CAlOB/1FpDzkYlEHuz2vcgQ1uh+058gvU4aNGbP5LTMispXsY7VwWRvpQkpBOskU2IxXR1RCAfi1T9my4+JQvZaiCLG6AZBfa/lqvJhxOHQ8iIHAzL0BqoBetl1eNM6ZXv08tTBrtRbcGVmo7B7+B32IvbH3osv1nI7M884a2d3qIO35ToFSk0BLbdMrWhg7+Z5BbYWuky9qeTdxX1u12airIya7PApB3csvGlY7LHQNFozB4JAv0bgNWY90Kj9vGDgLHzqpkjNQuvf69kYUoaCI+CQJS1S+DI6lMoJm0IEK3MoumGvKjzMOsxtNy/BbElFDntMFgQmd1vVnalYOYvShfClEQuUV13Oog76TMBmRCMB/sla+qSrmfIqNwMJ+/ms4u65HY+2SOavupniewUuwLzKsC579KpfY+U4hxA59txUmoakSWz2fGRpO/h0aikdHCvANlvSXdDbKk5uN5xJbHHSO+HkYB2+GTodBa5n0PQ4UIw7aOxmzEVaSH74oTGlXwBDE94tQ/Lv5LXiY3qH8nvdx6PwHYQjcpjT5qN6zOFAwHZ6hQrYi5LrPPVtzqo2trCGwXy0HBfoH1d7KLngARWmwy4IBu2IKjSYGZQvztzj2d252Sg4TaA25mfUPOItDwNR4V4Ucr01rJ1H0k5AZNgqwjlWt51SYQwaveSv1CmsHeoVStHj69VimkI+TsXj9lYy++Vt80OvPdC/2Pq7h/WhOxDrhyBEYdd93/AYRWWbUSXCN2PiFDbND9UqyFejP6A2HBAdRzVHGIa+XyTfo0V2PipIufLPCUMKHWKESZgEgxBecje/b0EjQ2aKYtiZAAciOJaJzyHtlLOjV1dy5UMirATvOL7jsxT63tMumM7cxyy0G0+gjUalon7X1Ud348kdINa17qzvFPgWDaYgo0NNe4KG0R X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6286 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: DB5EUR03FT017.eop-EUR03.prod.protection.outlook.com X-MS-Office365-Filtering-Correlation-Id-Prvs: e2d62bcf-3d2d-49eb-ec01-08d8d1aa7d43 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: R0S+aT3OP1EG3nULHl2XV2hZxMiszWFxlmJuyK4LAtYLt35GA75GIL6JfU11AaHAn6UyMCeMuToK6xK7dRtRzaqHHSp84sTp4yIbHVoD5sYvgOSAV12TWsEhcruDceJvyvLAhcGiGY4xAsrSg82S2xZ6v9JOXq+5RONpWGj3Dxsl1SrQuT5RPhMFcwl5LvNeDw1QwOGDcBAxFyA//9QFOSvwqjRwwVLDwMqyzSkwqehfAVGvpCmdtGY5NTPdW+aldpt7kydR6c7fw1Iw5EwDblAv1X1IcgVhoxbZTvbqOIfHDm4AOYjxOVqbZ8RMYOdmiTEyIXRA5hvss86fKC5AvdMlfU1rkVHnF5x2s0jbi4LKfrch/ym1v6RHI7aaxPbUtkN7bkIOSnnHffS+GWSgorTilpDXIFxZ43Apz50BLO6vSkYo1UmN+gbFEPF7KncJJBjdFHz4cpN0EHhxjwZr0AZFHSLBXPuIMOt0JNmTi+aEaqfMErMU/pxYT/QCL/JwdpPAkscXAKuPZF/FxrdOs3bsx5o3vXNR2ug1LM0CMim6bzBsoQzRK4hm1z8rPijAg+gi6OMWgc4GAJ7Ne/GLm5FnQqifov9uAKvKAfxBvTKY2HnUw9H2x3GKUOBCZgk5kmpLoI017HjiV7X9aEjsRxiwIySXcjQzCKgW3z5avDBWHTNcZ77G2Cwf5VXFksgX 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)(39850400004)(376002)(136003)(396003)(346002)(36840700001)(46966006)(478600001)(186003)(86362001)(16526019)(70206006)(8936002)(6506007)(8676002)(69590400012)(26005)(36860700001)(70586007)(336012)(6486002)(6666004)(956004)(2616005)(44832011)(5660300002)(83380400001)(6512007)(316002)(2906002)(47076005)(82310400003)(356005)(36756003)(81166007)(82740400003)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2021 12:09:12.1397 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 17ab58cd-e4ce-4aa5-08cb-08d8d1aa8193 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: DB5EUR03FT017.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8PR08MB6438 X-Spam-Status: No, score=-14.3 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-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Szabolcs Nagy via Libc-alpha From: Szabolcs Nagy Reply-To: Szabolcs Nagy Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" Since commit a509eb117fac1d764b15eba64993f4bdb63d7f3c Avoid late dlopen failure due to scope, TLS slotinfo updates [BZ #25112] the generation counter update is not needed in the failure path. --- elf/dl-tls.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/elf/dl-tls.c b/elf/dl-tls.c index 79b93ad91b..24d00c14ef 100644 --- a/elf/dl-tls.c +++ b/elf/dl-tls.c @@ -998,16 +998,7 @@ _dl_add_to_slotinfo (struct link_map *l, bool do_add) + TLS_SLOTINFO_SURPLUS * sizeof (struct dtv_slotinfo)); if (listp == NULL) { - /* We ran out of memory. We will simply fail this - call but don't undo anything we did so far. The - application will crash or be terminated anyway very - soon. */ - - /* We have to do this since some entries in the dtv - slotinfo array might already point to this - generation. */ - ++GL(dl_tls_generation); - + /* We ran out of memory while resizing the dtv slotinfo list. */ _dl_signal_error (ENOMEM, "dlopen", NULL, N_("\ cannot create TLS data structures")); }