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: sourceware.org; dkim=none (message not
 signed) header.d=none;sourceware.org; dmarc=none action=none
 header.from=arm.com;
From:   Szabolcs Nagy <szabolcs.nagy@arm.com>
To:     libc-alpha@sourceware.org
Cc:     Jeremy Linton <jeremy.linton@arm.com>,
        Catalin Marinas <catalin.marinas@arm.com>,
        Mark Rutland <mark.rutland@arm.com>,
        Will Deacon <will.deacon@arm.com>,
        Mark Brown <broonie@kernel.org>,
        Florian Weimer <fweimer@redhat.com>,
        Kees Cook <keescook@chromium.org>,
        Salvatore Mesoraca <s.mesoraca16@gmail.com>,
        Lennart Poettering <mzxreary@0pointer.de>,
        Topi Miettinen <toiwoton@gmail.com>,
        linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
        kernel-hardening@lists.openwall.com,
        linux-hardening@vger.kernel.org
Subject: [PATCH 0/4] aarch64: avoid mprotect(PROT_BTI|PROT_EXEC) [BZ #26831]
Date:   Tue,  3 Nov 2020 10:25:37 +0000
Message-Id: <cover.1604393169.git.szabolcs.nagy@arm.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from localhost.localdomain (217.140.106.54) by SN6PR2101CA0025.namprd21.prod.outlook.com (2603:10b6:805:106::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3564.6 via Frontend Transport; Tue, 3 Nov 2020 10:25:47 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 1cdce98f-1a27-4274-ea03-08d87fe2dee3
X-MS-TrafficTypeDiagnostic: PA4PR08MB6285:|AM9PR08MB6289:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <AM9PR08MB6289EE3B44CB905368676D81ED110@AM9PR08MB6289.eurprd08.prod.outlook.com>
x-checkrecipientrouted: true
NoDisclaimer: true
X-MS-Oob-TLC-OOBClassifiers: OLM:8882;OLM:8882;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam-Untrusted: BCL:0;
X-Microsoft-Antispam-Message-Info-Original: Stsu0KlIb4lIVOOruG4jS/t9+9pc1OmBNb73BCLh7fhi7Eq5PJQRKF+kJfjIpfgkKldLCchS08mJH89qcjTCa94WZmJKYsoTQo4YM9atfd9kDqX4or4wsrgxzkMhMb15Vgo57AWo9SQU9jlXQhztf4+JiVgGgY0ZYTzBEalByDd/DSOowhbD1lc/puItWGJVsDwPyH1cI1q2pfWOJpiwSX5/1tWrO7Ef22XFKNj2n+g+OXBSFf0BvokqMmiQAZgTuZOZIzB70XO43zwO4iaIBjXPr3GPOLH3NEeSKy2I6SrXNJd+dZyx1VEhlRJs85Q8+jk/i7DZSN+e8/d3N7VVEo3zStlheFVdm8/RuuSlbNvNRVB05X+VmxnbGV9ImcGWcxyhBBgy5fkigVi9NBadCKfh8buFP/hzqgYiAwk/c7Q=
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)(376002)(346002)(39860400002)(136003)(396003)(366004)(6506007)(36756003)(186003)(54906003)(478600001)(8936002)(6916009)(52116002)(316002)(4326008)(16526019)(26005)(69590400008)(86362001)(5660300002)(2616005)(44832011)(7416002)(956004)(8676002)(66476007)(66556008)(6512007)(83380400001)(6486002)(2906002)(6666004)(66946007)(83133001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: ZG0YhZU+otW5WO1ZgGeP4bqhUY0GXSksmxb9xYXof6TK25jFOavZyghJWuZ6wReEOVND03gBsMTpx20GXHnTGUKCblEBQEXg3waQNclQwWD7kg1pWbuN73oAuTYn1Um5FPNgjeWbiHDv2QBdMFTQk9Ats9GjwcEoqwukcmn5Zpc0VuUoGrooI4F/3hsFfjigrSP0eRbVRWoOFLXk4P1m4Lolq4l0an6stCFOvQZ4gcJgw0u4Ok5KcNqn0U0Zze7N3gofdU3p3cahfRHwqwAllZ9OzcWM71lh87pYiNxLTAu1dHhWKjDjMxiz0ElGb5GjVEj3YA1SLBuFxFOY7SKeqk894akYEWQaTA8l1JTXDJluYefX6ISDKBESqIQGYG/VBfHF+jODLt3+DAQQ7QOdycqwq9anjkgWH7oJSSryrNBZoYZ9I9AVKunvx/kQgYtj77EmQM7caDNLhZYmR4V9rtxqi8tCfT0kDy8TGlU8lnywohF5v9BBEy3YP8stsNwQYOGBzTXeJrFcsD4UU+S2xjjL7U33782oqTfscN6E6bI6aU2lTdlLQVNkJbSKVE2JpF+Xgl1fTFzTqKLsfbqdkZ7oPQsEoFsj0+XvQNapUkA76Kx7iRRXEomOY3YqJqF68laEI2I+8qpfnBfgl94EZg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR08MB6285
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: DB5EUR03FT040.eop-EUR03.prod.protection.outlook.com
X-MS-Office365-Filtering-Correlation-Id-Prvs: ec11855b-163b-432a-ee29-08d87fe2d6e5
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: XPhMnM+tOeoG9KHOpcGpO+7NrxKkFJ2LdhoqRPTGOqTk5Sw/RvTjeGduq/FzeeFlMbLXHHQNhxPO7AeyQrus4Zelb3WDfOn3jZJl8JDrEe9dKP//cSaL4zi4GjHFeEAl0b/cW7jL3trky+ssht0SzL0eQO8lDSVhgnxL2WSMU+mnNms8v3TNAuTw8LTuySwz1WCLgftovBOOn3d3e+lYNobyEpEp8rUWHb8YIYXcSNnH2PJi1DU9FctPF5sWMDtHKgb9GH+h4KxXQnJW4UNOmzMMefQCOQS+GgkH1UjDcXNCaOZOBwJnD8JLE/oatAkEMscwTiAjwlc0acDdwyYLBbP/kpydXL2/Th4MwBVZ/qSBAvwlR/qqNcyaMQGUHCY/etHHCVSm8lr53q57NKYCxgIieWQqJA4g30D7onC+Je41RvKaZXNSroEdLZ7fgT30wxoFcM2Ic5+D4cWlORvTtQ==
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)(39860400002)(396003)(136003)(346002)(376002)(46966005)(8936002)(6512007)(83380400001)(4326008)(34206002)(54906003)(47076004)(316002)(6666004)(450100002)(2906002)(70206006)(70586007)(82740400003)(356005)(6506007)(16526019)(186003)(82310400003)(26005)(81166007)(36756003)(86362001)(6486002)(478600001)(956004)(8676002)(2616005)(44832011)(69590400008)(5660300002)(336012)(83133001);DIR:OUT;SFP:1101;
X-OriginatorOrg: arm.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Nov 2020 10:26:05.1640
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 1cdce98f-1a27-4274-ea03-08d87fe2dee3
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: DB5EUR03FT040.eop-EUR03.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR08MB6289
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Re-mmap executable segments instead of mprotecting them in
case mprotect is seccomp filtered.

For the kernel mapped main executable we don't have the fd
for re-mmap so linux needs to be updated to add BTI. (In the
presence of seccomp filters for mprotect(PROT_EXEC) the libc
cannot change BTI protection at runtime based on user space
policy so it is better if the kernel maps BTI compatible
binaries with PROT_BTI by default.)

Szabolcs Nagy (4):
  elf: Pass the fd to note processing [BZ #26831]
  elf: Move note processing after l_phdr is updated [BZ #26831]
  aarch64: Use mmap to add PROT_BTI instead of mprotect [BZ #26831]
  aarch64: Remove the bti link_map field [BZ #26831]

 elf/dl-load.c              | 38 ++++++++++++++++---------------
 elf/rtld.c                 |  4 ++--
 sysdeps/aarch64/dl-bti.c   | 46 ++++++++++++++++++++------------------
 sysdeps/aarch64/dl-prop.h  | 17 +++++++-------
 sysdeps/aarch64/linkmap.h  |  1 -
 sysdeps/generic/dl-prop.h  |  6 ++---
 sysdeps/generic/ldsodefs.h |  5 +++--
 sysdeps/x86/dl-prop.h      |  6 ++---
 8 files changed, 64 insertions(+), 59 deletions(-)

-- 
2.17.1