Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp795903pxb; Tue, 3 Nov 2020 12:46:09 -0800 (PST) X-Google-Smtp-Source: ABdhPJzHsVNSYT++EpFzk5VmIx15ovrDKr2fpB5Xa9+9tG4REFttOgNDBDFm6EIomltgZ6YRJr/7 X-Received: by 2002:a17:906:3a1a:: with SMTP id z26mr21331688eje.519.1604436369288; Tue, 03 Nov 2020 12:46:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604436369; cv=none; d=google.com; s=arc-20160816; b=a8tnSKF6jfSMOjPTHVdDpDreDOw4FHh3IGgAP1wpr1Nf67ykyk/I3dXPHyoyV9YvTt 5PIhO4nAqhHdzKfmXy4QKv/EcSrsJ3q3Sjg3SOBF5gQQy3KNvOAzpIeVDIwNYbKPIPXF UMy4mU+ZwxDG2UcyBLYmxoO/ebM+2aDpiixo7Be+13g9pRx8wdmabTpSRH4Mqrjk4XjU Ncppm3+ODaq/4EN1zqVqVg36GNZvXCOpEJ0w/HHRgLmvjO/sd3FAfukFpavfUvwh42HO vqEnVnQ3xDiLjzxo8qtC0OwIYOA7+evwQ+ke9mB1LpKhVw+Q18TzFBIY9sIT1xx6y+pU xtgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=0hBzoXLNydgCvZE5/K+liBX/wVidOkouRdgxKaZ2ARY=; b=ESxnUX0oY0CEF4JvgTsAjfAyrSXmLpYi0tZjVPBFaGxNl5vQNRtCttCb104o4nAPP8 /DQ8ew3HqyO93qYOgV+tBbTJgT+Ow2FT4HorKnqh+K284U6eolVI50dntl3U+gyZTEij IFzU56JyW+1f44UNURD+CRBS/9qASMhT0MqcTC7venX80ohWD/+mBRFOU86o5qein5e3 vwb4IVOQ0iCPk2Qdct2JPTmnxUHEsVVUYv5rQhcZ7YHnauUj1aEiNUzTJ0Tfr3ElRu5D c1WSzIhtfCVH91z3O2LCQ4Lc1OV0H8YWvjIq42S/kqWYD5IesZzh8VWhy0825TQCYUzD Tg5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zfOL7CZe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id dx6si5666103ejb.698.2020.11.03.12.45.46; Tue, 03 Nov 2020 12:46:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zfOL7CZe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730144AbgKCUnV (ORCPT + 99 others); Tue, 3 Nov 2020 15:43:21 -0500 Received: from mail.kernel.org ([198.145.29.99]:56802 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730698AbgKCUnT (ORCPT ); Tue, 3 Nov 2020 15:43:19 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BBE6A223BD; Tue, 3 Nov 2020 20:43:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604436198; bh=LeGiku4X97SVHe5UN5990LzMhVAdcRkGpIjHSG99B2M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zfOL7CZeZkZDmlupYW4rJWsdfvkS+4wZd6wcT4kjkXCpwcO4x2tfKFqyLEdP8otDN AQRC/AKxbmHuRkV01t2uZy9wwjDZxzCJKZ03iWGlC3e9X4HsQYPl3o2ug0nP8yZlG7 GPUJfFpAWIwli+ouRv1uoUC7DYqpctid53L0kIrE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Masami Hiramatsu , Ingo Molnar , Sasha Levin Subject: [PATCH 5.9 097/391] ia64: kprobes: Use generic kretprobe trampoline handler Date: Tue, 3 Nov 2020 21:32:28 +0100 Message-Id: <20201103203353.415930205@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201103203348.153465465@linuxfoundation.org> References: <20201103203348.153465465@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Masami Hiramatsu [ Upstream commit e792ff804f49720ce003b3e4c618b5d996256a18 ] Use the generic kretprobe trampoline handler. Don't use framepointer verification. Signed-off-by: Masami Hiramatsu Signed-off-by: Ingo Molnar Link: https://lore.kernel.org/r/159870606883.1229682.12331813108378725668.stgit@devnote2 Signed-off-by: Sasha Levin --- arch/ia64/kernel/kprobes.c | 77 +------------------------------------- 1 file changed, 2 insertions(+), 75 deletions(-) diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c index 7a7df944d7986..fc1ff8a4d7de6 100644 --- a/arch/ia64/kernel/kprobes.c +++ b/arch/ia64/kernel/kprobes.c @@ -396,83 +396,9 @@ static void kretprobe_trampoline(void) { } -/* - * At this point the target function has been tricked into - * returning into our trampoline. Lookup the associated instance - * and then: - * - call the handler function - * - cleanup by marking the instance as unused - * - long jump back to the original return address - */ int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs) { - struct kretprobe_instance *ri = NULL; - struct hlist_head *head, empty_rp; - struct hlist_node *tmp; - unsigned long flags, orig_ret_address = 0; - unsigned long trampoline_address = - ((struct fnptr *)kretprobe_trampoline)->ip; - - INIT_HLIST_HEAD(&empty_rp); - kretprobe_hash_lock(current, &head, &flags); - - /* - * It is possible to have multiple instances associated with a given - * task either because an multiple functions in the call path - * have a return probe installed on them, and/or more than one return - * return probe was registered for a target function. - * - * We can handle this because: - * - instances are always inserted at the head of the list - * - when multiple return probes are registered for the same - * function, the first instance's ret_addr will point to the - * real return address, and all the rest will point to - * kretprobe_trampoline - */ - hlist_for_each_entry_safe(ri, tmp, head, hlist) { - if (ri->task != current) - /* another task is sharing our hash bucket */ - continue; - - orig_ret_address = (unsigned long)ri->ret_addr; - if (orig_ret_address != trampoline_address) - /* - * This is the real return address. Any other - * instances associated with this task are for - * other calls deeper on the call stack - */ - break; - } - - regs->cr_iip = orig_ret_address; - - hlist_for_each_entry_safe(ri, tmp, head, hlist) { - if (ri->task != current) - /* another task is sharing our hash bucket */ - continue; - - if (ri->rp && ri->rp->handler) - ri->rp->handler(ri, regs); - - orig_ret_address = (unsigned long)ri->ret_addr; - recycle_rp_inst(ri, &empty_rp); - - if (orig_ret_address != trampoline_address) - /* - * This is the real return address. Any other - * instances associated with this task are for - * other calls deeper on the call stack - */ - break; - } - kretprobe_assert(ri, orig_ret_address, trampoline_address); - - kretprobe_hash_unlock(current, &flags); - - hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) { - hlist_del(&ri->hlist); - kfree(ri); - } + regs->cr_iip = __kretprobe_trampoline_handler(regs, kretprobe_trampoline, NULL); /* * By returning a non-zero value, we are telling * kprobe_handler() that we don't want the post_handler @@ -485,6 +411,7 @@ void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri, struct pt_regs *regs) { ri->ret_addr = (kprobe_opcode_t *)regs->b0; + ri->fp = NULL; /* Replace the return addr with trampoline addr */ regs->b0 = ((struct fnptr *)kretprobe_trampoline)->ip; -- 2.27.0