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:     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: [PATCH v3 1/2] aarch64: align address for BTI protection [BZ #26988]
Date:   Wed,  2 Dec 2020 08:55:14 +0000
Message-Id: <d460a4f7aa4d70cc205f08896ed50b31fcd992df.1606898457.git.szabolcs.nagy@arm.com>
In-Reply-To: <ebce134991eae4261bbb32572a2062d3ca56e674.1606319495.git.szabolcs.nagy@arm.com>
References: <ebce134991eae4261bbb32572a2062d3ca56e674.1606319495.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 SA9PR13CA0048.namprd13.prod.outlook.com (2603:10b6:806:22::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3654.5 via Frontend Transport; Wed, 2 Dec 2020 08:55:24 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-HT: Tenant
X-MS-Office365-Filtering-Correlation-Id: 50854f6e-7555-4faa-e26c-08d896a00e39
X-MS-TrafficTypeDiagnostic: PR2PR08MB5225:|DB8PR08MB4571:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <DB8PR08MB45714548BDCEF75FACB9499FEDF30@DB8PR08MB4571.eurprd08.prod.outlook.com>
x-checkrecipientrouted: true
NoDisclaimer: true
X-MS-Oob-TLC-OOBClassifiers: OLM:2958;OLM:2958;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam-Untrusted: BCL:0;
X-Microsoft-Antispam-Message-Info-Original: XQm/MD2nC9jVAqH51R5remRXNMVEC+ZEC8vuP0FPtPiCjKDYxT4QJtW9W6xRWtUGwXiSBCjFPVgKw3kjSwHWeLeMVieRew979/C4K4+VzaDKfxN7rGstWPMzrUR95VP9qlVztwGR9E7+d9HNirN1YuXK1UmcR4WCRfGs2VtgiP2csdDOmNJ3wngbHEWDqogmIjAqLr+9zFALTCjVdYcLX7Cz4IkYjTOh0S0XkperrBQWCQe+ftzD2Q9zPe8azjoP5OwGyh4upVI7Bc6pBYxX45DSe+GyXPk7hUU8squfCQiUpKEUn8TIGMkyDFKrKPB4wQF5jEA9415q8fTA6jXhJPX2nE87pWMwJsJZz7Qtjb2ORxc3Q9p1jb5Grom5vzdn
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)(346002)(136003)(376002)(366004)(39850400004)(396003)(6506007)(6512007)(2616005)(6916009)(2906002)(4326008)(86362001)(36756003)(44832011)(5660300002)(16526019)(316002)(956004)(83380400001)(26005)(52116002)(6666004)(8936002)(186003)(66476007)(478600001)(66946007)(69590400008)(66556008)(6486002)(8676002)(54906003);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData: =?us-ascii?Q?tf69SYnzRWkaNKv0ag04kv0/kv4K4DyvGgFFBvFHiU9lZ1p4dDN7IbD+YVxl?=
 =?us-ascii?Q?o1MoQfpB+MXuZJg5TkzM8ZaUUkWJrU6aMP21Msq7Sgf7dzi+lrQK9SSHY9H7?=
 =?us-ascii?Q?G8R3vQyFDXLCu9tZnsu+yR/BBIxjACQjDqprwu5PLf6Mg2YEZqE6FNf5Izas?=
 =?us-ascii?Q?PQpEKSdv759zyHFHJA/2e6Eq2j4wXcOcOPfImaH0V7/RT6ZhHkHTWkjjno25?=
 =?us-ascii?Q?SDbf2mPctb2PCC59uYaPL6UUrPdPKh+agt6r21+nt0zvOzR8qCevcY9L6S37?=
 =?us-ascii?Q?EwoeDXIJ/44A/zrAo521hfTZUK2DUoqZdImSU1Yvomj4/T3mOqaLNexGNiIi?=
 =?us-ascii?Q?CFJ/sqd/W6JNFvS1hH8RjxuzP1IbuTM89u+5E38I+L/JNNvBWcBUr8C6w9Rp?=
 =?us-ascii?Q?CSwLwisSke501wtPeN6X+jUhNMA4d+6mlfQVl4losBUKgsC/myANIZms1y4v?=
 =?us-ascii?Q?6iU/9Ma46PO6IlYFBOmxmScLy4nTOfIlvNcgVtSA/1v5/WVzW8ne/QH+kg6X?=
 =?us-ascii?Q?BTwVfZytHer0oBmYaGrxrBwFZYaWDb0lOtpbA59X6b1QFUq3nILm+yX+ayxo?=
 =?us-ascii?Q?YZZnCsF+PvjQ1MqAY+Qyt/7gnmYvjTBvVdbuFO+SLxPYQL28VMbdlMSD4wyu?=
 =?us-ascii?Q?VCXy5YuPYBdMKikmz8G5+9ckp9OT/GAD4xIoG2EcibtRjPNIlGWHmRnKbwJr?=
 =?us-ascii?Q?T9jrMEj8Wi6leg3lGnwqcMHbxrxpI+MTwAt7p+OA72VYyCgtgKjX23GlyvMT?=
 =?us-ascii?Q?HwSWXaEzzv+q77uVFRqlx/zsesjtSMFwLgshg6ai4+EijvRDIuGdvYpG0oB0?=
 =?us-ascii?Q?CtGPfpUrPnjYNhuihPz1C5Rp2B/Yf6KO9p5QZcxfx0p+lIEPIS3IAlabOuzq?=
 =?us-ascii?Q?eGcaQQe5AOJfmmdXLIfC8nQBdxYJ4C3PhQOAR6GFP3l4CAU8wcIa7iDw31lI?=
 =?us-ascii?Q?jW3bVEQerYkqISI3mqWq+iq8Wt5BkmqfcjJoLKaCSlctbPmUDxgCZ5Jt4n4t?=
 =?us-ascii?Q?tnYO?=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR2PR08MB5225
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: AM5EUR03FT035.eop-EUR03.prod.protection.outlook.com
X-MS-Office365-Filtering-Correlation-Id-Prvs: a1bf3ed6-a11e-46b9-875a-08d896a003ba
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: dxNDiIL+Oejvw2x79KmtUlk4DI9kRNgpkA2twwV0iknG03tZGsr0Ri0yhEnxZ9BP50XWLVP+uXEXKqhgSw3juM4L7vwViTHt56ZLCSidnIFuxFTJeemVHHbNwmHTjzNIgd3bCRuwELXcZvJ9ARg037qC2tA0AGXdBrR7Hvg14Za/1tWlyK/2jhT+6cgxkkwwpH5asznDKIC0c5pC2N/VjV3eM25udjOQoFhE12tLyPKuSe0xDqaXGT70ALrmwqaRvyn5AxliCxzLceXG6LuGazfa46m7HgOUpiIeXBOtVvTqX2A63cvBcAquUeTUYLrBagg7oW7g9oV4ShcPE1h9A/iS4AIyI4jqqZweFjtsmAug0O0J0GK99cDkXM9MoqTYlOBKaRCxdkdUTTfOS5GwThOkV67WTQwnrgBAEB6g+p2hIXpmHL5VOtNwBP+K8aHD
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:ErrorRetry;CAT:NONE;SFS:(4636009)(346002)(376002)(39860400002)(396003)(136003)(46966005)(2616005)(336012)(478600001)(6506007)(81166007)(86362001)(5660300002)(47076004)(83380400001)(70586007)(956004)(82740400003)(70206006)(44832011)(6666004)(316002)(54906003)(107886003)(356005)(6486002)(8676002)(186003)(2906002)(82310400003)(16526019)(6512007)(8936002)(4326008)(69590400008)(34206002)(36906005)(36756003)(26005);DIR:OUT;SFP:1101;
X-OriginatorOrg: arm.com
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2020 08:55:44.9813
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 50854f6e-7555-4faa-e26c-08d896a00e39
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: AM5EUR03FT035.eop-EUR03.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB4571
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Handle unaligned executable load segments (the bfd linker is not
expected to produce such binaries, but other linkers may).

Computing the mapping bounds follows _dl_map_object_from_fd more
closely now.

Fixes bug 26988.
---
v3:
- split the last patch in two so this bug is fixed separately.
- pushed to nsz/btifix-v3 branch.

 sysdeps/aarch64/dl-bti.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sysdeps/aarch64/dl-bti.c b/sysdeps/aarch64/dl-bti.c
index 8f4728adce..67d63c8a73 100644
--- a/sysdeps/aarch64/dl-bti.c
+++ b/sysdeps/aarch64/dl-bti.c
@@ -20,19 +20,22 @@
 #include <libintl.h>
 #include <ldsodefs.h>
 
-static int
+static void
 enable_bti (struct link_map *map, const char *program)
 {
+  const size_t pagesz = GLRO(dl_pagesize);
   const ElfW(Phdr) *phdr;
-  unsigned prot;
 
   for (phdr = map->l_phdr; phdr < &map->l_phdr[map->l_phnum]; ++phdr)
     if (phdr->p_type == PT_LOAD && (phdr->p_flags & PF_X))
       {
-	void *start = (void *) (phdr->p_vaddr + map->l_addr);
-	size_t len = phdr->p_memsz;
+	size_t vstart = ALIGN_DOWN (phdr->p_vaddr, pagesz);
+	size_t vend = ALIGN_UP (phdr->p_vaddr + phdr->p_filesz, pagesz);
+	off_t off = ALIGN_DOWN (phdr->p_offset, pagesz);
+	void *start = (void *) (vstart + map->l_addr);
+	size_t len = vend - vstart;
 
-	prot = PROT_EXEC | PROT_BTI;
+	unsigned prot = PROT_EXEC | PROT_BTI;
 	if (phdr->p_flags & PF_R)
 	  prot |= PROT_READ;
 	if (phdr->p_flags & PF_W)
@@ -48,7 +51,6 @@ enable_bti (struct link_map *map, const char *program)
 				N_("mprotect failed to turn on BTI"));
 	  }
       }
-  return 0;
 }
 
 /* Enable BTI for MAP and its dependencies.  */
-- 
2.17.1