From patchwork Fri Aug 21 19:43:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 11730435 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1F2FC618 for ; Fri, 21 Aug 2020 19:56:35 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E92AC20724 for ; Fri, 21 Aug 2020 19:56:34 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="LXivZxe2"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="KCpWIGu2" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E92AC20724 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=dW/lxaRZTyce0W0Xs0HpVJchWUg+YeXPbhQFJWzByi4=; b=LXivZxe2MzoceU6eHR2Kc35Mn 7siVzKujfUj+zPeb+Xb7E83VfYwoHXLZt7WzXMtTL7H7I3aJNVGt0XDHnYUuwLF1sR6KsEkYqp7/l UVDDBtZDol+h4ytTA0dySN6SGoerlQ20C541zHvOEHtYWBoYNt3bXMzOPixGzsEMogVHzdR9xanEZ RFEcSCFihACLG2CjByVnGYeUeCz3CHxLiSpbp4WkAod6+xTyarVyeHaVneY617WvB47UJoZt7O2qh hbzdobxZ+Ho/ibjAJEkytHFSBj76j18ISkQcaL83QL4tqUp5wk415XDTSvHrq1a+b4rmomr5y5I+7 XCgzJTU8A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9D7Y-0003K6-Iq; Fri, 21 Aug 2020 19:54:40 +0000 Received: from mail-pf1-x443.google.com ([2607:f8b0:4864:20::443]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k9D6y-00035F-IJ for linux-arm-kernel@lists.infradead.org; Fri, 21 Aug 2020 19:54:05 +0000 Received: by mail-pf1-x443.google.com with SMTP id u20so1592400pfn.0 for ; Fri, 21 Aug 2020 12:54:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PeNFh808sp94203AedRRDxtBogHXBjPfBsBbm9/bM3w=; b=KCpWIGu2/MoubKQjEEdpSZyLun4iQCojW3eL8PjI2Ey8IgO2OcGgVhrFyHJn60Oux1 fAkef240dPlqqfWatRfeUzI0UXYkuVBgt7cQxaJhM6IEUsH+zU6+dsXGqqDYhsj3l+/E d+7ZofSbpYqxDUrDxEuyZZyHy5U/1ElZSYieo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=PeNFh808sp94203AedRRDxtBogHXBjPfBsBbm9/bM3w=; b=s1C70X1mAAX2KGzc8d5c/KBsbfLi3fHgQLd8WZ3O/PKp5Yh0ek9rxHcny9pmogwXdE KMJKk/MR9E8gFOZv+XXTxLZJSfCvpXoa/o0WVr1PLnHx3iFz+VyWdrJ3Fab3/TwW1qN4 4amfgldHUbnnvuzeSIn/KUa7j68rWZpqRVUsVO1pJedldeGGUiGt9QNVbN2aiYE9mnaT +zeOufIOqSxSXTMd5fnMhRpSz5xDVNZzGM/IrN4auFO252Whz4Zn7MxKAjoEiPysxZ/N 8b/tNjKnhJErG/0ruKdeShfSxyWBBiTzHPndUuxXxBrhLFRTP7h/kbrNndZOsnGisbAw Cfqg== X-Gm-Message-State: AOAM531EvPYClCifzaf6rLWaejJbrfEZ9t84jU9rl/4SsQRR2TsI4s91 T4I9xIPso27mKMq0ojQ1ka+9YQ== X-Google-Smtp-Source: ABdhPJz2gpH4NA/nopyFe5T4J16P06sAq6mOjn6oaCK64m6qXX90A5MjjPsdZ/Av2ZQInlq5xfJc5g== X-Received: by 2002:aa7:8bd2:: with SMTP id s18mr3553849pfd.284.1598039642687; Fri, 21 Aug 2020 12:54:02 -0700 (PDT) Received: from www.outflux.net (smtp.outflux.net. [198.145.64.163]) by smtp.gmail.com with ESMTPSA id x11sm2748233pgl.65.2020.08.21.12.53.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Aug 2020 12:53:59 -0700 (PDT) From: Kees Cook To: Ingo Molnar Subject: [PATCH v6 22/29] x86/asm: Avoid generating unused kprobe sections Date: Fri, 21 Aug 2020 12:43:03 -0700 Message-Id: <20200821194310.3089815-23-keescook@chromium.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200821194310.3089815-1-keescook@chromium.org> References: <20200821194310.3089815-1-keescook@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200821_155404_626547_F8D61036 X-CRM114-Status: GOOD ( 13.25 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2607:f8b0:4864:20:0:0:0:443 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , linux-arch@vger.kernel.org, linux-efi@vger.kernel.org, Kees Cook , Arnd Bergmann , Catalin Marinas , Masahiro Yamada , x86@kernel.org, Nick Desaulniers , Russell King , linux-kernel@vger.kernel.org, clang-built-linux@googlegroups.com, Arvind Sankar , Ingo Molnar , James Morse , Nathan Chancellor , Borislav Petkov , Peter Collingbourne , Ard Biesheuvel , linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org When !CONFIG_KPROBES, do not generate kprobe sections. This makes sure there are no unexpected sections encountered by the linker scripts. Signed-off-by: Kees Cook --- arch/x86/include/asm/asm.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h index 5c15f95b1ba7..4712206c4325 100644 --- a/arch/x86/include/asm/asm.h +++ b/arch/x86/include/asm/asm.h @@ -138,11 +138,15 @@ # define _ASM_EXTABLE_FAULT(from, to) \ _ASM_EXTABLE_HANDLE(from, to, ex_handler_fault) -# define _ASM_NOKPROBE(entry) \ +# ifdef CONFIG_KPROBES +# define _ASM_NOKPROBE(entry) \ .pushsection "_kprobe_blacklist","aw" ; \ _ASM_ALIGN ; \ _ASM_PTR (entry); \ .popsection +# else +# define _ASM_NOKPROBE(entry) +# endif #else /* ! __ASSEMBLY__ */ # define _EXPAND_EXTABLE_HANDLE(x) #x