From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AH8x224oltD7t15GkFnFI4itWHJrgZ9tYr7DIXocYwIv/KeKDPCWALtkK43fEZp/dzYl+pNlbeie ARC-Seal: i=1; a=rsa-sha256; t=1516610963; cv=none; d=google.com; s=arc-20160816; b=Q23NT7Zx9UKq91tptTPheZxIr8fW1UeCjAad9uOUa6HHyCsELgALMvCfSsHNut6ahv 6Owz5rar5sYkIZeWaNNk7HW1NqS+INloorZbP9vhbz/FeeSmtoOe9YRV/zQly83gj4ta d3b6IR2+7G1QUeKUcKaNHZ1Yyittj3olXdE5AiyId/PQ532d9FNq9WhGcnBZ6auXS4Sg 60HFKlbAkLvp1xokfXwmqeB01/KbqFJfxsYKxFX7+Ir1f91JmnibZ44a6pbKFNMZEqUC NeN0tLiM+Zkd63m37pp9GxH9Anyx577VJUUg+bI/08YBffyOhjJMaerucXkDJ7JbFzg9 6H3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=oQf5emtcrdqoWbpZv/P7GrZXpz2ED8rGmG7j8pm7BO8=; b=rAQwrLrScgklyhc4mjby8h0UBTK7ZlY039pcqs0AzQXr1Trd4ZPsaERjaVobl6sgdr bo4t4peCmxK0h7d4Xp01NdyHUJE43TAaW3fH1ks80pQ7TZu3xJ0VYgmmml5S29ODsmbe xja6CKJTdQmIIeKaNDV6lwsUdxYw7iKcMWpmCE8UlT2dcCNgzHX2+Q/5mu3sTBEdxGXT MYVc5H4Rrc02hR3cC5u1ShYw2kXTR21SBl/+h6w96UqOKsEPkWWDXiEiUtyCO7+CR9NE my5SlmvyxOZj89Yd14te5FET84oM5NAn8dKQRAECTvTAvesjDdh9bNr1e/7zqlIFmJD8 j3IQ== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.71.90 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masami Hiramatsu , Thomas Gleixner , David Woodhouse , Andi Kleen , Peter Zijlstra , Ananth N Mavinakayanahalli , Arjan van de Ven , Greg Kroah-Hartman Subject: [PATCH 4.9 44/47] kprobes/x86: Blacklist indirect thunk functions for kprobes Date: Mon, 22 Jan 2018 09:45:55 +0100 Message-Id: <20180122083928.924372460@linuxfoundation.org> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180122083925.568134913@linuxfoundation.org> References: <20180122083925.568134913@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1590281444885539021?= X-GMAIL-MSGID: =?utf-8?q?1590281857819184043?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Masami Hiramatsu commit c1804a236894ecc942da7dc6c5abe209e56cba93 upstream. Mark __x86_indirect_thunk_* functions as blacklist for kprobes because those functions can be called from anywhere in the kernel including blacklist functions of kprobes. Signed-off-by: Masami Hiramatsu Signed-off-by: Thomas Gleixner Acked-by: David Woodhouse Cc: Andi Kleen Cc: Peter Zijlstra Cc: Ananth N Mavinakayanahalli Cc: Arjan van de Ven Cc: Greg Kroah-Hartman Link: https://lkml.kernel.org/r/151629209111.10241.5444852823378068683.stgit@devbox Signed-off-by: Greg Kroah-Hartman --- arch/x86/lib/retpoline.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) --- a/arch/x86/lib/retpoline.S +++ b/arch/x86/lib/retpoline.S @@ -25,7 +25,8 @@ ENDPROC(__x86_indirect_thunk_\reg) * than one per register with the correct names. So we do it * the simple and nasty way... */ -#define EXPORT_THUNK(reg) EXPORT_SYMBOL(__x86_indirect_thunk_ ## reg) +#define __EXPORT_THUNK(sym) _ASM_NOKPROBE(sym); EXPORT_SYMBOL(sym) +#define EXPORT_THUNK(reg) __EXPORT_THUNK(__x86_indirect_thunk_ ## reg) #define GENERATE_THUNK(reg) THUNK reg ; EXPORT_THUNK(reg) GENERATE_THUNK(_ASM_AX)