From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 921D7C433EF for ; Thu, 24 Feb 2022 05:40:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 211B78D0003; Thu, 24 Feb 2022 00:40:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1C1BC8D0001; Thu, 24 Feb 2022 00:40:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0B07B8D0003; Thu, 24 Feb 2022 00:40:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.27]) by kanga.kvack.org (Postfix) with ESMTP id DCE3C8D0001 for ; Thu, 24 Feb 2022 00:40:14 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 834A922F84 for ; Thu, 24 Feb 2022 05:40:14 +0000 (UTC) X-FDA: 79176572748.14.C15DEC3 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) by imf08.hostedemail.com (Postfix) with ESMTP id EB21C160002 for ; Thu, 24 Feb 2022 05:40:13 +0000 (UTC) Received: by mail-pg1-f175.google.com with SMTP id 132so860671pga.5 for ; Wed, 23 Feb 2022 21:40:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KUrjnSR2O207wl/KgPF4WFxzn/5+qyXjBbdrgpn74ec=; b=Zcva9b79EO27FMwaZqhkQmi2C3qXN1cjHhc6RAFneX/fNCPfxov3sHq6b7HNY1rauX 6dLQXz99cSK5012k50Rn4vOaEFKP1Zw9ZynrshJkBNT2ZZiKVundssVvLLFocPhqce9p gys42g6Uz9gOskZuIs896Iv1zCZThSQLt7d0A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KUrjnSR2O207wl/KgPF4WFxzn/5+qyXjBbdrgpn74ec=; b=de13wEmwgAKGw879/gC2yz45smdWR6ujzplPbhBmvhWeEezwP93dWn/1J158gvPt3z HgfMgw7epFA97eBqmVjvtVgvKYe8Z7x/rzv0flDLzseNjkY50AR0K49cGQLq6/P9Vw/o ArkIJX4i1PdIJ801nK6zxe9fB4bxBFNW+7QfQIeqwdew7Mg4cSZrpra5lXUxwWWydDX3 ahLDysIcRNa2Ncu577AFgvfXduw5mUX6+/qp7n6E3w6Wz5LKtx97g1fKsEP2SdCVMEkO 2c1Cuhr5NHdhwy/Dz86afCEfBL3fHbkrs19K52a85Osl6yIxyEATQcNZaEkSiNMnmSI0 C6EA== X-Gm-Message-State: AOAM5339vp9jrRSCKKvKOljXzlwl6iUcdV+DOkeQzipyqpdcHV0CDaCo OO+NX2BgGXj7f2wylcZ+mXLIpQ== X-Google-Smtp-Source: ABdhPJyJTZwbrBYIgzpKU3TSYvloJombRvUFLeu3xy1uW0E6d/GTsYL7IVSSKPu2DJeUDlfClhY1Lw== X-Received: by 2002:a05:6a00:148f:b0:4bc:fb2d:4b6f with SMTP id v15-20020a056a00148f00b004bcfb2d4b6fmr1213264pfu.62.1645681212842; Wed, 23 Feb 2022 21:40:12 -0800 (PST) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id j12sm1448848pfu.79.2022.02.23.21.40.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Feb 2022 21:40:12 -0800 (PST) From: Kees Cook To: Eric Biederman Cc: Kees Cook , Peter Collingbourne , Catalin Marinas , Dave Martin , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-hardening@vger.kernel.org Subject: [PATCH] ELF: Properly redefine PT_GNU_* in terms of PT_LOOS Date: Wed, 23 Feb 2022 21:40:11 -0800 Message-Id: <20220224054011.1852264-1-keescook@chromium.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1117; h=from:subject; bh=YPig1YOT1VAMyQwHwKMHLoGk8gDQ7+8i5Oupd/upzAI=; b=owEBbQKS/ZANAwAKAYly9N/cbcAmAcsmYgBiFxo6UL94HlohdKVbWsom4kOiCRaxulVCwE/ewmxB IK6bY2+JAjMEAAEKAB0WIQSlw/aPIp3WD3I+bhOJcvTf3G3AJgUCYhcaOgAKCRCJcvTf3G3AJuw5EA CHaz3ExoZEfKFLE5GrkSqVhaiRerpzFFMZsQCgfdu/v5FyREohk7aJLs6wlN2QTfF4KJSgyWPHjZTE ypwcVnsGs19FUCVge376LOqDNQ/oaCdPIgOzcEnIT8dGvMtJjCljG1MTs6cbA/EvYeQjIN0xOB1obx aSiHROgTHk/M0ICsMsDQ1iCAEWzZIQ3pPHwqQBPKQUHKoTDWiCq6uIgjUzWbiedr4f39NHEQnohiVi Ec4K3KIdKDLMiVHeTlTmBzf+TlciIJjKeDwlpiItZJR6ycacCU0AaYO+slSe1j7ui1fdmOASjEXh7a GbjxKvXwRX2mBv1rgAvRnMoEQHq6xyIOPWo/19NG0YCymkRdfBCKJvpYaGPibsHZiQjY9siVRDRtuP kGNNRLoBrrnVcl2Y7pwt1zBbTYRjFNzbFUNJHnptJjHoUBmsgBmnXnR7gyYGtqpJ/ho8GPBTryAIrw EmsYyEAlfFjinmAidjZnsAaCIFzFOq12AJb/kwya8XbeVkcphs1rCZ9svlXnA9RRHs7Bspoi6tv+4+ 9LI7OE0HSqjWlTXrxA8r226/3HpMmhRNbn8LV+AWtqHU8TXajNJ8CeHL/0AkVsYF2jmG5NPsJIMPBu +S/pg8iXlt6zhnUPhwXyO/hI7Z1vGoXz5KY5k51PAHkPsnoDjr5Sf4rBmTwA== X-Developer-Key: i=keescook@chromium.org; a=openpgp; fpr=A5C3F68F229DD60F723E6E138972F4DFDC6DC026 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: EB21C160002 X-Stat-Signature: ymy93fqofz418b9kmf6xzpukas4ey1s5 Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=chromium.org header.s=google header.b=Zcva9b79; dmarc=pass (policy=none) header.from=chromium.org; spf=pass (imf08.hostedemail.com: domain of keescook@chromium.org designates 209.85.215.175 as permitted sender) smtp.mailfrom=keescook@chromium.org X-Rspam-User: X-Rspamd-Server: rspam11 X-HE-Tag: 1645681213-885225 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: The PT_GNU_* program header types are actually offsets from PT_LOOS, so redefine them as such, reorder them, and add the missing PT_GNU_RELRO. Cc: Eric Biederman Cc: Peter Collingbourne Cc: Catalin Marinas Cc: Dave Martin Signed-off-by: Kees Cook --- include/uapi/linux/elf.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index 61bf4774b8f2..6438d55529bf 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -35,10 +35,11 @@ typedef __s64 Elf64_Sxword; #define PT_HIOS 0x6fffffff /* OS-specific */ #define PT_LOPROC 0x70000000 #define PT_HIPROC 0x7fffffff -#define PT_GNU_EH_FRAME 0x6474e550 -#define PT_GNU_PROPERTY 0x6474e553 - +#define PT_GNU_EH_FRAME (PT_LOOS + 0x474e550) #define PT_GNU_STACK (PT_LOOS + 0x474e551) +#define PT_GNU_RELRO (PT_LOOS + 0x474e552) +#define PT_GNU_PROPERTY (PT_LOOS + 0x474e553) + /* * Extended Numbering -- 2.30.2