From patchwork Mon Oct 31 12:07:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 13025695 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 595A5FA3744 for ; Mon, 31 Oct 2022 12:07:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231199AbiJaMHv (ORCPT ); Mon, 31 Oct 2022 08:07:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231229AbiJaMHu (ORCPT ); Mon, 31 Oct 2022 08:07:50 -0400 Received: from mail-pl1-x62b.google.com (mail-pl1-x62b.google.com [IPv6:2607:f8b0:4864:20::62b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F023A558F; Mon, 31 Oct 2022 05:07:49 -0700 (PDT) Received: by mail-pl1-x62b.google.com with SMTP id 4so10582429pli.0; Mon, 31 Oct 2022 05:07:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=N8KXzElrk7eZcMvhOMGLSocH1L3elk+opngelcioVZk=; b=iVH3xGKfWj//tRC8mM1EDHEmdHABtRA8Pk7XmKUNly4hgpoPYEh/S/T7cSVvmsVZ9V EZCIICLmWJQwpFAUZ4Hh1SULQNKji2cPYa3jzPzxndTJivwgpcRuH4zA8ovmgpGzZc9b Q4dSuejOClokJ1UkY6ntHGI29r4injlv6Jam6f0Lc5kgkMQRK3gG/Z1phb5GSU16uha7 gpTXWLzMDB14ykOoPDZyiiYpnbkXnZDls+w8cewlMBjcK9c8Y5IhrvwDZl7wahO8PrUA GSLu7V+XPYwbxchdEm/1ZJf08sZwJKetrWbh9h4jrZdoGjdmv2Ez4HuQXWT1VYA55ISF GzKA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N8KXzElrk7eZcMvhOMGLSocH1L3elk+opngelcioVZk=; b=YdVqil90czp7lNeYfMtyCq35bYj8Jo+HANGTvR4+5yAIHbFdbcZ/ckY0JciYNMDiRW KcfgSFvAaGqVhyNxNE9WiwLfWmSLIH9YRvHYyWH8ftYd83vuFIr5pQ7bUME43oP9C036 ERrMFcF4Bzztz3c2KwAcI1SMoamScUw+JN/T7UdIIgQm3/v1RyMmcUsVLADcUdy0arOz 0tHVZpkwsoiW49sH6UvS+LqPbb3Gg+HVSvd0w+Cq49B3iXkOjOvQKkq87Ja3rUxSMDnm Bf+0mJzIy3fMHfjVkK8P8iszE4/kWgezv6T/cCa7wtbZxhR7O6AxWlBoG2/rZydV4FiM KLmQ== X-Gm-Message-State: ACrzQf1cBh20x2C68w1rQtioqBVbNdbpibtYcyuYP3GySYHVHK+iE54T 1KcAFpS/p4SO2u4HGsXW6VLaKU+ZNXM= X-Google-Smtp-Source: AMsMyM6MFVIN9ZCxpO8+Mlfo/DtTtXcUUJD5nQ8a+6f0AqXpe5QBHKUoFQkKe6J3rVoTNuJG6AvzXg== X-Received: by 2002:a17:903:1c2:b0:187:feb:1f31 with SMTP id e2-20020a17090301c200b001870feb1f31mr10217779plh.92.1667218069206; Mon, 31 Oct 2022 05:07:49 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (193-116-106-251.tpgi.com.au. [193.116.106.251]) by smtp.gmail.com with ESMTPSA id p17-20020a170902e75100b0017e64da44c5sm1595134plf.203.2022.10.31.05.07.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 05:07:48 -0700 (PDT) From: Nicholas Piggin To: linux-modules@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: Nicholas Piggin , linux-kernel@vger.kernel.org, Michael Ellerman , Jessica Yu , Luis Chamberlain Subject: [PATCH v5 1/2] module: add module_elf_check_arch for module-specific checks Date: Mon, 31 Oct 2022 22:07:32 +1000 Message-Id: <20221031120733.3956781-2-npiggin@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221031120733.3956781-1-npiggin@gmail.com> References: <20221031120733.3956781-1-npiggin@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: The elf_check_arch() function is also used to test compatibility of usermode binaries. Kernel modules may have more specific requirements, for example powerpc would like to test for ABI version compatibility. Add a weak module_elf_check_arch() that defaults to true, and call it from elf_validity_check(). Cc: Michael Ellerman Signed-off-by: Jessica Yu [np: added changelog, adjust name, rebase] Signed-off-by: Nicholas Piggin Acked-by: Luis Chamberlain --- include/linux/moduleloader.h | 3 +++ kernel/module/main.c | 10 ++++++++++ 2 files changed, 13 insertions(+) diff --git a/include/linux/moduleloader.h b/include/linux/moduleloader.h index 9e09d11ffe5b..7b4587a19189 100644 --- a/include/linux/moduleloader.h +++ b/include/linux/moduleloader.h @@ -13,6 +13,9 @@ * must be implemented by each architecture. */ +/* arch may override to do additional checking of ELF header architecture */ +bool module_elf_check_arch(Elf_Ehdr *hdr); + /* Adjust arch-specific sections. Return 0 on success. */ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, diff --git a/kernel/module/main.c b/kernel/module/main.c index d02d39c7174e..7b3f6fb0d428 100644 --- a/kernel/module/main.c +++ b/kernel/module/main.c @@ -1674,6 +1674,11 @@ static int elf_validity_check(struct load_info *info) info->hdr->e_machine); goto no_exec; } + if (!module_elf_check_arch(info->hdr)) { + pr_err("Invalid module architecture in ELF header: %u\n", + info->hdr->e_machine); + goto no_exec; + } if (info->hdr->e_shentsize != sizeof(Elf_Shdr)) { pr_err("Invalid ELF section header size\n"); goto no_exec; @@ -2247,6 +2252,11 @@ static void flush_module_icache(const struct module *mod) (unsigned long)mod->core_layout.base + mod->core_layout.size); } +bool __weak module_elf_check_arch(Elf_Ehdr *hdr) +{ + return true; +} + int __weak module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, char *secstrings, From patchwork Mon Oct 31 12:07:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicholas Piggin X-Patchwork-Id: 13025696 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A692FA3740 for ; Mon, 31 Oct 2022 12:08:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231258AbiJaMIB (ORCPT ); Mon, 31 Oct 2022 08:08:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39616 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231249AbiJaMHz (ORCPT ); Mon, 31 Oct 2022 08:07:55 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3866AE0AA; Mon, 31 Oct 2022 05:07:54 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id p21so6677159plr.7; Mon, 31 Oct 2022 05:07:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1zed+8ilXn6MGIJcL2z90P1TobfWQ+njImejMWMmf58=; b=VBJYqllwLFKjjSog/J2zrGa1E0jj6lPzM1Ul9Z7cCsRz8OTNshgJ2ToIavollcnHLt 3Xh0awyDJZ+YLP1fO/40IlMN/ZwdoBVWWA7qOMRW2GjrY3h/PvN5a0KcCKfcMSzGIW10 2S+wm31G2aDkYuffcnTHjN3SnfuTN7VvJNmPpHJ93uK1NYPOeADA+cZefMhs73PR+sOo TSnoO7bwOPE3ThPzfvkY4EPsR3Exf5qS48DKXjV/V5IqgHufQmzgGB7T+Wed/ZIX8AXC AsUkncP/ob33JkaFN+r3IsiYeqp8Br6SNYftE8LGqsLFD8C83+O5bRsNxT0bUEcR/sbl aCkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1zed+8ilXn6MGIJcL2z90P1TobfWQ+njImejMWMmf58=; b=Sp8yI/EW7H/T2NDQa+9ey0SNekrpH+zZ1inEWwcjTSkQrLWYK/aZpadpJCW4vuCO1n XFSmTo1cM2rHH3dkBzA0ZvzjI/m1Fb+NWLhGejNSRJDYP7Y9PkDrfs5UXNKnOTDyBdM9 ld3fCbcK1/zVAIzPmNGbk7g1zSTFkWTa6gN0/2Sblcmgq/6tAj84zb8MDNjHZQE7ADAW NCXI0cUW4f5sjPbJUQAiYZh1ifqYSmssy/kzbG3AMOd5SzxMN9zqB+kbDKC02XzBTK0k 9Kq4fkZzp+hjy7oH7XDX2sQC8Ae+Fo74emFatdHW+0w8MVDsEo/ZwSs9+TSnTq9I+F5k GVyg== X-Gm-Message-State: ACrzQf1IoKxPGWVWal8yMI1mkNppVkeyqyL4WmE4jx3bdP+dFv6Q4jwl 0Dq6aRWcNyFOloPfiPfpgNRIf+iR2+Q= X-Google-Smtp-Source: AMsMyM6XhgTq1aU0IovI+tOfx0sloE3/zK0Q6l/El5DFFIfDlPvfv+ImgWi15cABY0LrTsEWLwRPBg== X-Received: by 2002:a17:90a:fe5:b0:212:cae0:7482 with SMTP id 92-20020a17090a0fe500b00212cae07482mr14516891pjz.108.1667218073416; Mon, 31 Oct 2022 05:07:53 -0700 (PDT) Received: from bobo.ozlabs.ibm.com (193-116-106-251.tpgi.com.au. [193.116.106.251]) by smtp.gmail.com with ESMTPSA id p17-20020a170902e75100b0017e64da44c5sm1595134plf.203.2022.10.31.05.07.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 05:07:52 -0700 (PDT) From: Nicholas Piggin To: linux-modules@vger.kernel.org, linuxppc-dev@lists.ozlabs.org Cc: Nicholas Piggin , linux-kernel@vger.kernel.org, Michael Ellerman , Jessica Yu , Luis Chamberlain Subject: [PATCH v5 2/2] powerpc/64: Add module check for ELF ABI version Date: Mon, 31 Oct 2022 22:07:33 +1000 Message-Id: <20221031120733.3956781-3-npiggin@gmail.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221031120733.3956781-1-npiggin@gmail.com> References: <20221031120733.3956781-1-npiggin@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: Override the generic module ELF check to provide a check for the ELF ABI version. This becomes important if we allow big-endian ELF ABI V2 builds but it doesn't hurt to check now. Cc: Jessica Yu Signed-off-by: Michael Ellerman [np: split patch, added changelog, adjust to Jessica's proposal] Signed-off-by: Nicholas Piggin --- arch/powerpc/kernel/module.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/arch/powerpc/kernel/module.c b/arch/powerpc/kernel/module.c index f6d6ae0a1692..d46bf9bfda26 100644 --- a/arch/powerpc/kernel/module.c +++ b/arch/powerpc/kernel/module.c @@ -19,6 +19,23 @@ static LIST_HEAD(module_bug_list); +#ifdef CONFIG_PPC64 +bool module_elf_check_arch(Elf_Ehdr *hdr) +{ + unsigned long abi_level = hdr->e_flags & 0x3; + + if (IS_ENABLED(CONFIG_PPC64_ELF_ABI_V2)) { + if (abi_level != 2) + return false; + } else { + if (abi_level >= 2) + return false; + } + + return true; +} +#endif + static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, const Elf_Shdr *sechdrs, const char *name)