From patchwork Fri Oct 15 12:52:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Masami Hiramatsu (Google)" X-Patchwork-Id: 12561461 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA3E0C433F5 for ; Fri, 15 Oct 2021 13:01:58 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id B3E9A61090 for ; Fri, 15 Oct 2021 13:01:58 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org B3E9A61090 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xwQ0yTQeRD3FjSkg9CpcMm8kuJEc5nJAc4iZXnxD9/0=; b=Dcuy1haN0+N9wT TolFa1jkZmFDWHk3MWA6TIZVEdnT44wCshVhlv3GCiplh1yul3OQsn7TMkDhonwlBJPkntO6eO6/o LYM2qk9CQqGGJfLy/pwUskVY4LW4i7/4Lb49o+o9W31Epr6/tZdRZu/CADVAr4z8DrNCze7gH+OAr fgNP/uMqBuIJlbeeIwpuaj3TfIIT8qpaDYC/wLDv23cGuUl8Fgq6gdgnj5yKCP6j2XC6Q51X9d/UQ Nsg3FY+/IpKdniyvG7gNvgU17TIM4SlVp/Xb8dkGZRu5hQaDLg5UsPm5+vE9igrlDCDhqyoHglAEk 8IhAXzf3a5l4LgQbQ0qA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbMoQ-0075bl-Hu; Fri, 15 Oct 2021 12:59:51 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1mbMh8-0071nc-4P for linux-arm-kernel@lists.infradead.org; Fri, 15 Oct 2021 12:52:19 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 50A1160ED4; Fri, 15 Oct 2021 12:52:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1634302337; bh=EyoCpAJO1kfofsL3gEQly+uRiLZYa9weOYK4M4P9yI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eAwTenk213ykTtTC152Z1rE9becZKfqIURox5GSsXUTQhD8h83iNO+T5nThet9reh QRLUogxGqTC9Dr3s0HsmsidnW9eAQkF4PP6iFymRVXDNj6vreQ87Y5UFuRE5Dbwr47 yP7HJbxtwDjv/Nvxsz05dDwUP+iBHKdbxyfYpcwkO7vgqYI+iLWYPm9umo8u/jSv9t zytO/2EcwDoKtZLtBiSuP4B03ByfGsoOrpWH0vlm9rwKr6jU4oppKH8Hwkm1EmaWYm uGpWLDTyK3sotdAP9mQ2HyunkIeKdOZ/Am6238FRT7OmRS4O/9Xo49TRmCAXAiDoCC ZCxjqLHWdxd+Q== From: Masami Hiramatsu To: Steven Rostedt Cc: "Naveen N . Rao" , Ananth N Mavinakayanahalli , Ingo Molnar , linux-kernel@vger.kernel.org, mhiramat@kernel.org, Sven Schnelle , Catalin Marinas , Will Deacon , Russell King , Nathan Chancellor , Nick Desaulniers , linux-arm-kernel@lists.infradead.org Subject: [PATCH 10/10] [RFC] arm64: kprobes: Detect error of kretprobe return address fixup Date: Fri, 15 Oct 2021 21:52:14 +0900 Message-Id: <163430233451.459050.14342207133770952671.stgit@devnote2> X-Mailer: git-send-email 2.25.1 In-Reply-To: <163430224341.459050.2369208860773018092.stgit@devnote2> References: <163430224341.459050.2369208860773018092.stgit@devnote2> User-Agent: StGit/0.19 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211015_055218_259328_71286F1A X-CRM114-Status: GOOD ( 20.56 ) 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 Add kretprobe_next_ret_addr() which can detect errors in the given parameter or the kretprobe_instance list, and call it from arm64 stacktrace. This kretprobe_next_ret_addr() will return following errors when it detects; - -EINVAL if @cur is NULL (caller issue) - -ENOENT if there is no next correct return address (either kprobes or caller issue) - -EILSEQ if the next currect return address is there but doesn't match the framepointer (maybe caller issue) Thus the caller must check the error and handle it. On arm64, this tries to handle the errors and show it on the log. Suggested-by: Mark Rutland Signed-off-by: Masami Hiramatsu --- arch/arm64/kernel/stacktrace.c | 10 +++++++- include/linux/kprobes.h | 2 ++ kernel/kprobes.c | 49 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/stacktrace.c b/arch/arm64/kernel/stacktrace.c index c30624fff6ac..e2f9f479da99 100644 --- a/arch/arm64/kernel/stacktrace.c +++ b/arch/arm64/kernel/stacktrace.c @@ -133,8 +133,14 @@ int notrace unwind_frame(struct task_struct *tsk, struct stackframe *frame) } #endif /* CONFIG_FUNCTION_GRAPH_TRACER */ #ifdef CONFIG_KRETPROBES - if (is_kretprobe_trampoline(frame->pc)) - frame->pc = kretprobe_find_ret_addr(tsk, (void *)frame->fp, &frame->kr_cur); + if (is_kretprobe_trampoline(frame->pc)) { + void *ret = kretprobe_next_ret_addr(tsk, (void *)frame->fp, &frame->kr_cur); + /* There must be a bug in this unwinder or kretprobe. */ + if (WARN_ON_ONCE(IS_ERR(ret))) + pr_err("Kretprobe_trampoline recovery failed (%d)\n", PTR_ERR(ret)); + else + frame->pc = (unsigned long)ret; + } #endif frame->pc = ptrauth_strip_insn_pac(frame->pc); diff --git a/include/linux/kprobes.h b/include/linux/kprobes.h index e974caf39d3e..8133455c3522 100644 --- a/include/linux/kprobes.h +++ b/include/linux/kprobes.h @@ -516,6 +516,8 @@ static nokprobe_inline bool is_kretprobe_trampoline(unsigned long addr) unsigned long kretprobe_find_ret_addr(struct task_struct *tsk, void *fp, struct llist_node **cur); +kprobe_opcode_t *kretprobe_next_ret_addr(struct task_struct *tsk, void *fp, + struct llist_node **cur); #else static nokprobe_inline bool is_kretprobe_trampoline(unsigned long addr) { diff --git a/kernel/kprobes.c b/kernel/kprobes.c index 4676627cb066..c57168753467 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -1922,6 +1922,55 @@ unsigned long kretprobe_find_ret_addr(struct task_struct *tsk, void *fp, } NOKPROBE_SYMBOL(kretprobe_find_ret_addr); +/** + * kretprobe_next_ret_addr -- Find next correct return address from @cur + * @tsk: Target task + * @fp: A framepointer to verify + * @cur: a storage and the base point of the loop cursor. + * + * Find the next correct return address modified by a kretprobe on @tsk from + * the entry which points *@cur. If it finds the next currect return address + * whose framepointer matches @fp, returns the return address. + * If the next current return address's framepointer doesn't match @fp, this + * returns ERR_PTR(-EILSEQ). If the *@cur is the end of the kretprobe_instance + * list, returns ERR_PTR(-ENOENT). If the @cur is NULL, returns ERR_PTR(-EINVAL). + * The @tsk must be 'current' or a task which is not running. @fp is used for + * verifying the framepointer which recorded with the correct return address + * (kretprobe_instance::fp field.) + * The @cur is a loop cursor for searching the kretprobe return addresses on + * the @tsk. If *@cur is NULL, this returns the top entry of the correct return + * address. + */ +kprobe_opcode_t *kretprobe_next_ret_addr(struct task_struct *tsk, void *fp, + struct llist_node **cur) +{ + struct kretprobe_instance *ri = NULL; + kprobe_opcode_t *ret; + + if (WARN_ON_ONCE(!cur)) + return ERR_PTR(-EINVAL); + + if (*cur) { + /* This returns the next correct return address */ + ret = __kretprobe_find_ret_addr(tsk, cur); + if (!ret) + return ERR_PTR(-ENOENT); + ri = container_of(*cur, struct kretprobe_instance, llist); + return ri->fp == fp ? ret : ERR_PTR(-EILSEQ); + } + + /* If this is the first try, find the FP-matched entry */ + do { + ret = __kretprobe_find_ret_addr(tsk, cur); + if (!ret) + return ERR_PTR(-ENOENT); + ri = container_of(*cur, struct kretprobe_instance, llist); + } while (ri->fp != fp); + + return ret; +} +NOKPROBE_SYMBOL(kretprobe_next_ret_addr); + void __weak arch_kretprobe_fixup_return(struct pt_regs *regs, kprobe_opcode_t *correct_ret_addr) {