From patchwork Tue Sep 12 14:16:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 13381767 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7AD58CA0EED for ; Tue, 12 Sep 2023 14:18:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:Message-ID: References:Mime-Version:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=zCFi5lAmo9wOYofmVjS4Z5TK4pzBMGC+SH3lIDO1xMI=; b=uDgKfQXQNsjwlwWjn7jvKPX1Xe R2vWtBis/1yt4LV9QUXLmz8xXvkGKbO6Zkp3RgRLqxTm+yrHrxSqvyZeChkkfUFBRjYBm0C+Gt5qE LiEZGoMZFQh+G4sc+JYMNerx8r255AunFu0rXs77dgRzbYG8M4ibR2v5pN1i3eEKfpvPCXtxERGHQ C8kviwFLU214rjJgNDq7mY+cc47dO79vxbhjkRiCa9P0lvfTOpCRZIpDiKkiBOL/TsjkLMQyRi4IW cHhXBCwlAqASw3O7FQSWooJan4bcJx/17CgwZlMPUkebrZFrlX4QhvsO6fDGMyK9s2Yin2ZutCBmy wXQvOYeg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1qg4D4-003W4R-2r; Tue, 12 Sep 2023 14:17:46 +0000 Received: from mail-yw1-x1149.google.com ([2607:f8b0:4864:20::1149]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1qg4Cz-003VzN-0p for linux-arm-kernel@lists.infradead.org; Tue, 12 Sep 2023 14:17:42 +0000 Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-59b5d4a8242so42911807b3.0 for ; Tue, 12 Sep 2023 07:17:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694528260; x=1695133060; darn=lists.infradead.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=JMOcmR6gwIMeL1pByZVoCRpSMNbE6fe+QeZKiWAXH4c=; b=eHFKT0aCkJ7GnuCWdYW1Kz3RS8lfO0nsEYo7dKhcrHcO+GVBp3wFvAHawTDmhixGfr We+7m+roG8JWLi9c77m5ingc1MVMHGGJtnEbOetPkOPjKbQWFVqsUy07sR9UzUC+JpkE S51WtUKrc8OFpCHW0le/9vleb4ScjEGvoKdRuN9Lb7MrCdZzlYqXdcposGdZ8yRUvsFX YnlUfknkYUhCGhq09iNZKbwL+GkUI70C62QO2EBX+rq4LtblMvS7ldGCpHa5NwqKQ8w1 uhDz+/fRq91uWnM9GFdmHhw7MwoqlD1vmsMoDEQFhy0RtWZVeLyLO3YYcj49Feh0GqUM f16Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694528260; x=1695133060; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=JMOcmR6gwIMeL1pByZVoCRpSMNbE6fe+QeZKiWAXH4c=; b=a1ldKV9/qx46EKurWHlh43mgdCm+IfkDWzWg78+m45G+VQ6ZzvKxIdSjizN4Ag/tYH GTBvXHTFHdlA4w5R6PM4n+ndYw3sztQ4BMDXZOQn1xqps/UyHmN+l7/wlUeBPhO0oCWC qpW87xQdKJCwoczXoFEvr62wWZa8n8Gp26bIC4gaWXBIUerD4wnv0KG34nI1BEj1iakB YDTOZbfQ7SnnC7CaU/dg7NIXMesVbXMRU3Ux1aeldxzRuElKBv9UOCTGSmR8rJWnBhEl SMLPK7wvVDL5v4XkwwpwD7QGjIR0Z1UQP89tmcpls4o822Iy5IuZ+S2ctlLEJ/RFFqkR 1E5w== X-Gm-Message-State: AOJu0YywSDKGaXuNNzNCDoaKhs4F7zyXnYRmSG4BcHOo2QrzhA8IHLtp eJoIWHXYiPR0l4b3sfIjvTXUA954HIi65zQcEG8WTJc2oDA3W6nMznuZEzPxCVoMaeMU8r9FNHY LdVj+WdEvEUzASWCt+FSVL2E18AtDjWetNURhNjfgMrQRxyOat1oJJQKERI/AGB/3fzGxAZ35F2 k= X-Google-Smtp-Source: AGHT+IGRKDxpjX4m8db72UgMkSwt0UdKqFM/3cTTk2G/ALaKkvS7/R+PGgLoAQPQ3nj5vhxDWkBl9UUk X-Received: from palermo.c.googlers.com ([fda3:e722:ac3:cc00:28:9cb1:c0a8:118a]) (user=ardb job=sendgmr) by 2002:a81:ad04:0:b0:584:41a6:6cd8 with SMTP id l4-20020a81ad04000000b0058441a66cd8mr299236ywh.8.1694528260131; Tue, 12 Sep 2023 07:17:40 -0700 (PDT) Date: Tue, 12 Sep 2023 14:16:01 +0000 In-Reply-To: <20230912141549.278777-63-ardb@google.com> Mime-Version: 1.0 References: <20230912141549.278777-63-ardb@google.com> X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Developer-Signature: v=1; a=openpgp-sha256; l=6463; i=ardb@kernel.org; h=from:subject; bh=HYrF1i309+7W6RY+1XcsEkqxhtaRh+j6zQpK8dqLGDQ=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIZWhaOFZf82Um+lTVaYeudPufWkZZ/xpw84o59Ii3mt5i 61Ej2/uKGVhEONgkBVTZBGY/ffdztMTpWqdZ8nCzGFlAhnCwMUpABOxLWRkeMt1+JTkvge/ReR7 zr3u+PLZZvWzrfME1c6z3nEsPHnQN5fhryyXdYStW6+dQ7JH0+1jX9cLRP7++PvH30xzIaElc75 ZsgMA X-Mailer: git-send-email 2.42.0.283.g2d96d420d3-goog Message-ID: <20230912141549.278777-74-ardb@google.com> Subject: [PATCH v4 11/61] arm64: kernel: Manage absolute relocations in code built under pi/ From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Catalin Marinas , Will Deacon , Marc Zyngier , Mark Rutland , Ryan Roberts , Anshuman Khandual , Kees Cook , Joey Gouly X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230912_071741_301466_DF8150B3 X-CRM114-Status: GOOD ( 25.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Ard Biesheuvel The mini C runtime runs before relocations are processed, and so it cannot rely on statically initialized pointer variables. Add a check to ensure that such code does not get introduced by accident, by going over the relocations in each object, identifying the ones that operate on data sections that are part of the executable image, and raising an error if any relocations of type R_AARCH64_ABS64 exist. Note that such relocations are permitted in other places (e.g., debug sections) and will never occur in compiler generated code sections when using the small code model, so only check sections that have SHF_ALLOC set and SHF_EXECINSTR cleared. To accommodate cases where statically initialized symbol references are unavoidable, introduce a special case for ELF input data sections that have ".rodata.prel64" in their names, and in these cases, instead of rejecting any encountered ABS64 relocations, convert them into PREL64 relocations, which don't require any runtime fixups. Note that the code in question must still be modified to deal with this, as it needs to convert the 64-bit signed offsets into absolute addresses before use. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/pi/Makefile | 9 +- arch/arm64/kernel/pi/pi.h | 14 +++ arch/arm64/kernel/pi/relacheck.c | 130 ++++++++++++++++++++ 3 files changed, 151 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/pi/Makefile b/arch/arm64/kernel/pi/Makefile index c844a0546d7f..bc32a431fe35 100644 --- a/arch/arm64/kernel/pi/Makefile +++ b/arch/arm64/kernel/pi/Makefile @@ -22,11 +22,16 @@ KCSAN_SANITIZE := n UBSAN_SANITIZE := n KCOV_INSTRUMENT := n +hostprogs := relacheck + +quiet_cmd_piobjcopy = $(quiet_cmd_objcopy) + cmd_piobjcopy = $(cmd_objcopy) && $(obj)/relacheck $(@) $(<) + $(obj)/%.pi.o: OBJCOPYFLAGS := --prefix-symbols=__pi_ \ --remove-section=.note.gnu.property \ --prefix-alloc-sections=.init -$(obj)/%.pi.o: $(obj)/%.o FORCE - $(call if_changed,objcopy) +$(obj)/%.pi.o: $(obj)/%.o $(obj)/relacheck FORCE + $(call if_changed,piobjcopy) $(obj)/lib-%.o: $(srctree)/lib/%.c FORCE $(call if_changed_rule,cc_o_c) diff --git a/arch/arm64/kernel/pi/pi.h b/arch/arm64/kernel/pi/pi.h new file mode 100644 index 000000000000..f455ad385976 --- /dev/null +++ b/arch/arm64/kernel/pi/pi.h @@ -0,0 +1,14 @@ +// SPDX-License-Identifier: GPL-2.0-only +// Copyright 2023 Google LLC +// Author: Ard Biesheuvel + +#define __prel64_initconst __section(".init.rodata.prel64") + +typedef volatile signed long prel64_t; + +static inline void *prel64_to_pointer(const prel64_t *offset) +{ + if (!*offset) + return NULL; + return (void *)offset + *offset; +} diff --git a/arch/arm64/kernel/pi/relacheck.c b/arch/arm64/kernel/pi/relacheck.c new file mode 100644 index 000000000000..b0cd4d0d275b --- /dev/null +++ b/arch/arm64/kernel/pi/relacheck.c @@ -0,0 +1,130 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright (C) 2023 - Google LLC + * Author: Ard Biesheuvel + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ +#define HOST_ORDER ELFDATA2LSB +#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ +#define HOST_ORDER ELFDATA2MSB +#endif + +static Elf64_Ehdr *ehdr; +static Elf64_Shdr *shdr; +static const char *strtab; +static bool swap; + +static uint64_t swab_elfxword(uint64_t val) +{ + return swap ? __builtin_bswap64(val) : val; +} + +static uint32_t swab_elfword(uint32_t val) +{ + return swap ? __builtin_bswap32(val) : val; +} + +static uint16_t swab_elfhword(uint16_t val) +{ + return swap ? __builtin_bswap16(val) : val; +} + +int main(int argc, char *argv[]) +{ + struct stat stat; + int fd, ret; + + if (argc < 3) { + fprintf(stderr, "file arguments missing\n"); + exit(EXIT_FAILURE); + } + + fd = open(argv[1], O_RDWR); + if (fd < 0) { + fprintf(stderr, "failed to open %s\n", argv[1]); + exit(EXIT_FAILURE); + } + + ret = fstat(fd, &stat); + if (ret < 0) { + fprintf(stderr, "failed to stat() %s\n", argv[1]); + exit(EXIT_FAILURE); + } + + ehdr = mmap(0, stat.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (ehdr == MAP_FAILED) { + fprintf(stderr, "failed to mmap() %s\n", argv[1]); + exit(EXIT_FAILURE); + } + + swap = ehdr->e_ident[EI_DATA] != HOST_ORDER; + shdr = (void *)ehdr + swab_elfxword(ehdr->e_shoff); + strtab = (void *)ehdr + + swab_elfxword(shdr[swab_elfhword(ehdr->e_shstrndx)].sh_offset); + + for (int i = 0; i < swab_elfhword(ehdr->e_shnum); i++) { + unsigned long info, flags; + bool prel64 = false; + Elf64_Rela *rela; + int numrela; + + if (swab_elfword(shdr[i].sh_type) != SHT_RELA) + continue; + + /* only consider RELA sections operating on data */ + info = swab_elfword(shdr[i].sh_info); + flags = swab_elfxword(shdr[info].sh_flags); + if ((flags & (SHF_ALLOC | SHF_EXECINSTR)) != SHF_ALLOC) + continue; + + /* + * We generally don't permit ABS64 relocations in the code that + * runs before relocation processing occurs. If statically + * initialized absolute symbol references are unavoidable, they + * may be emitted into a *.rodata.prel64 section and they will + * be converted to place-relative 64-bit references. This + * requires special handling in the referring code. + */ + if (strstr(strtab + swab_elfword(shdr[info].sh_name), + ".rodata.prel64")) { + prel64 = true; + } + + rela = (void *)ehdr + swab_elfxword(shdr[i].sh_offset); + numrela = swab_elfxword(shdr[i].sh_size) / sizeof(*rela); + + for (int j = 0; j < numrela; j++) { + uint64_t info = swab_elfxword(rela[j].r_info); + + if (ELF64_R_TYPE(info) != R_AARCH64_ABS64) + continue; + + if (prel64) { + /* convert ABS64 into PREL64 */ + info ^= R_AARCH64_ABS64 ^ R_AARCH64_PREL64; + rela[j].r_info = swab_elfxword(info); + } else { + fprintf(stderr, + "Unexpected absolute relocations detected in %s\n", + argv[2]); + close(fd); + unlink(argv[1]); + exit(EXIT_FAILURE); + } + } + } + close(fd); + return 0; +}