Received: by 2002:a05:6a10:413:0:0:0:0 with SMTP id 19csp172015pxp; Tue, 8 Mar 2022 23:58:13 -0800 (PST) X-Google-Smtp-Source: ABdhPJxldpK2zmtOXxJtoiCK7Td9C3oi0kfjJcpJEzmCLfWpVQiqZ9LxzCQlar6nOqSHI3x4qrhp X-Received: by 2002:a17:907:7659:b0:6da:a62f:8c1d with SMTP id kj25-20020a170907765900b006daa62f8c1dmr16238962ejc.453.1646812692784; Tue, 08 Mar 2022 23:58:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1646812692; cv=none; d=google.com; s=arc-20160816; b=yCnbc5ZK5zodPY3qEbY/782rHmqS6c+xuIJErVbq3ONoVX8G4kaaMdK3z3ACy6KnTV g8Z1AvtG3aUZQQhjAC9XxtUcBGNw3rSi1WkPY6mSjQ3VsIdWWMNAmDGA73A1UQ4WeGf5 F0xp39gNsDqlfpMcmSwPJQKX4tvIpC7Wzv2LJn1aArCJuvZ7hSSp2n5EUgaEiixNAIaj Otqzlh23HbnS5+ro4ImTpwiiyXpsL/eeKHdemaUuWaBKLdQ6mF0gNdOTYEYQ290EeNbN nEWEyfAJmWkMtXTFtTEMCNCN7FEm52VRo/Q70C35UBgUCKMu5M16SUitBr88lqipWiTg yAaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=Jhd7tZtcmoo1IfdR/9Zh6k7DyL5hblXhZIb1Q14j81Q=; b=MtxkQsu+W+QSBV+HRB60NY0DxfXw083wilx2hXvUaYoLwCRyl/VfTXhB72rKJw3bQo h6FAGtStGf25cqDAUKaAFRb+c4LQXbNQEJrqFAeQKwwx00sUeJVgJekymv73o9i/5/ds wNKiBzTWVk0zcfWopf5GOnwRdeNUDQmpa8kBjUBadBESx1XrTVsFMQ9Gofb+u9VWrjwy 2buoZS6Lx5XjOilF2PdnGC86JTAGZYOW2wQjiAj1kl5PPDccHB3hg9KJbW0JDqPnKMe5 qjX4SunfrkDiuM41pcPjS/VA+aHI37jAebyqxwz4moj4UcfvaPYN/K1cl6i6GqLtZgVw YW5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=EcMiIFzR; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=TlIc9L0H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id e6-20020a170906c00600b006cf37fc8be2si705889ejz.206.2022.03.08.23.57.49; Tue, 08 Mar 2022 23:58:12 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=EcMiIFzR; dkim=neutral (no key) header.i=@linutronix.de header.s=2020e header.b=TlIc9L0H; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230013AbiCIHzn (ORCPT + 99 others); Wed, 9 Mar 2022 02:55:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229815AbiCIHzl (ORCPT ); Wed, 9 Mar 2022 02:55:41 -0500 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B51BD148648; Tue, 8 Mar 2022 23:54:42 -0800 (PST) Date: Wed, 09 Mar 2022 07:54:39 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1646812480; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jhd7tZtcmoo1IfdR/9Zh6k7DyL5hblXhZIb1Q14j81Q=; b=EcMiIFzRZ0LlrpeoHgCbcaHJnWvs+moOFeV7Wlas9Cx8NVW8OAxTCZBpOqQWiBcJyNj2Ln 47fBxOjq+TW5hQzvkiW2nqY4q3PVVsRtdrGAMSepR/4waV1qIUH6IyqdAHQCnU1ruoYMQR MMaSRseKwz3uf6EgcV9aEFl2FpKLHbrlXwqhtYklObQnACtZjC6IJ+XVHKuUPnWXc90qXa vHg31tYfEiE46pH3dMVIUgN6IM/cz1wosN+jcrP5sSiF0tCPCh9AGKzGYTNE4ihNtMk1b6 NLkjFHo7U70jFFqe3XFA//Ct4R00gU68ldtH8URGF417n284xDaFV/elGGuwRQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1646812480; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Jhd7tZtcmoo1IfdR/9Zh6k7DyL5hblXhZIb1Q14j81Q=; b=TlIc9L0HtmAF1uxLOn1CEzj1sk7ZTn1xa2rQ0DE0PqklMEFSpMwaxaqTT6PRt4XdoJSfRM N8oda87Q2OyaWXDg== From: "tip-bot2 for Peter Zijlstra" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: x86/core] objtool: Find unused ENDBR instructions Cc: "Peter Zijlstra (Intel)" , Josh Poimboeuf , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20220308154319.763643193@infradead.org> References: <20220308154319.763643193@infradead.org> MIME-Version: 1.0 Message-ID: <164681247972.16921.14960523932262794973.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following commit has been merged into the x86/core branch of tip: Commit-ID: 49f8cb48085ddcacc942d9270c305b31887f0aca Gitweb: https://git.kernel.org/tip/49f8cb48085ddcacc942d9270c305b31887f0aca Author: Peter Zijlstra AuthorDate: Tue, 08 Mar 2022 16:30:55 +01:00 Committer: Peter Zijlstra CommitterDate: Tue, 08 Mar 2022 23:53:39 +01:00 objtool: Find unused ENDBR instructions Find all ENDBR instructions which are never referenced and stick them in a section such that the kernel can poison them, sealing the functions from ever being an indirect call target. This removes about 1-in-4 ENDBR instructions. Signed-off-by: Peter Zijlstra (Intel) Acked-by: Josh Poimboeuf Link: https://lore.kernel.org/r/20220308154319.763643193@infradead.org --- arch/x86/kernel/vmlinux.lds.S | 9 +++- tools/objtool/check.c | 69 +++++++++++++++++++++++- tools/objtool/include/objtool/objtool.h | 1 +- tools/objtool/objtool.c | 1 +- 4 files changed, 78 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S index 27f8303..7fda7f2 100644 --- a/arch/x86/kernel/vmlinux.lds.S +++ b/arch/x86/kernel/vmlinux.lds.S @@ -285,6 +285,15 @@ SECTIONS } #endif +#ifdef CONFIG_X86_KERNEL_IBT + . = ALIGN(8); + .ibt_endbr_seal : AT(ADDR(.ibt_endbr_seal) - LOAD_OFFSET) { + __ibt_endbr_seal = .; + *(.ibt_endbr_seal) + __ibt_endbr_seal_end = .; + } +#endif + /* * struct alt_inst entries. From the header (alternative.h): * "Alternative instructions for different CPU types or capabilities" diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 28163ea..d921a47 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -382,6 +382,7 @@ static int decode_instructions(struct objtool_file *file) memset(insn, 0, sizeof(*insn)); INIT_LIST_HEAD(&insn->alts); INIT_LIST_HEAD(&insn->stack_ops); + INIT_LIST_HEAD(&insn->call_node); insn->sec = sec; insn->offset = offset; @@ -419,8 +420,9 @@ static int decode_instructions(struct objtool_file *file) sym_for_each_insn(file, func, insn) { insn->func = func; - if (insn->type == INSN_ENDBR) { + if (insn->type == INSN_ENDBR && list_empty(&insn->call_node)) { if (insn->offset == insn->func->offset) { + list_add_tail(&insn->call_node, &file->endbr_list); file->nr_endbr++; } else { file->nr_endbr_int++; @@ -741,6 +743,58 @@ static int create_retpoline_sites_sections(struct objtool_file *file) return 0; } +static int create_ibt_endbr_seal_sections(struct objtool_file *file) +{ + struct instruction *insn; + struct section *sec; + int idx; + + sec = find_section_by_name(file->elf, ".ibt_endbr_seal"); + if (sec) { + WARN("file already has .ibt_endbr_seal, skipping"); + return 0; + } + + idx = 0; + list_for_each_entry(insn, &file->endbr_list, call_node) + idx++; + + if (stats) { + printf("ibt: ENDBR at function start: %d\n", file->nr_endbr); + printf("ibt: ENDBR inside functions: %d\n", file->nr_endbr_int); + printf("ibt: superfluous ENDBR: %d\n", idx); + } + + if (!idx) + return 0; + + sec = elf_create_section(file->elf, ".ibt_endbr_seal", 0, + sizeof(int), idx); + if (!sec) { + WARN("elf_create_section: .ibt_endbr_seal"); + return -1; + } + + idx = 0; + list_for_each_entry(insn, &file->endbr_list, call_node) { + + int *site = (int *)sec->data->d_buf + idx; + *site = 0; + + if (elf_add_reloc_to_insn(file->elf, sec, + idx * sizeof(int), + R_X86_64_PC32, + insn->sec, insn->offset)) { + WARN("elf_add_reloc_to_insn: .ibt_endbr_seal"); + return -1; + } + + idx++; + } + + return 0; +} + static int create_mcount_loc_sections(struct objtool_file *file) { struct section *sec; @@ -3119,8 +3173,12 @@ validate_ibt_reloc(struct objtool_file *file, struct reloc *reloc) if (!dest) return NULL; - if (dest->type == INSN_ENDBR) + if (dest->type == INSN_ENDBR) { + if (!list_empty(&dest->call_node)) + list_del_init(&dest->call_node); + return NULL; + } if (reloc->sym->static_call_tramp) return NULL; @@ -3859,6 +3917,13 @@ int check(struct objtool_file *file) warnings += ret; } + if (ibt) { + ret = create_ibt_endbr_seal_sections(file); + if (ret < 0) + goto out; + warnings += ret; + } + if (stats) { printf("nr_insns_visited: %ld\n", nr_insns_visited); printf("nr_cfi: %ld\n", nr_cfi); diff --git a/tools/objtool/include/objtool/objtool.h b/tools/objtool/include/objtool/objtool.h index fa3c7fa..7a5c13a 100644 --- a/tools/objtool/include/objtool/objtool.h +++ b/tools/objtool/include/objtool/objtool.h @@ -26,6 +26,7 @@ struct objtool_file { struct list_head retpoline_call_list; struct list_head static_call_list; struct list_head mcount_loc_list; + struct list_head endbr_list; bool ignore_unreachables, c_file, hints, rodata; unsigned int nr_endbr; diff --git a/tools/objtool/objtool.c b/tools/objtool/objtool.c index bdf699f..b09946f 100644 --- a/tools/objtool/objtool.c +++ b/tools/objtool/objtool.c @@ -128,6 +128,7 @@ struct objtool_file *objtool_open_read(const char *_objname) INIT_LIST_HEAD(&file.retpoline_call_list); INIT_LIST_HEAD(&file.static_call_list); INIT_LIST_HEAD(&file.mcount_loc_list); + INIT_LIST_HEAD(&file.endbr_list); file.c_file = !vmlinux && find_section_by_name(file.elf, ".comment"); file.ignore_unreachables = no_unreachable; file.hints = false;