From mboxrd@z Thu Jan 1 00:00:00 1970 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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id C2EE6CA0FED for ; Wed, 10 Sep 2025 15:25:32 +0000 (UTC) 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:Message-ID:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=OpZhOi/9levRbGxZGDRaqz9+rERu/HNkuNT6Bk+7xWU=; b=N4cYnUccczrrnZ nQpPx3Kba5TY+X8L2lygUcWMi1QQNeqb97YdkrgJZjWV2k0yQz2G7CslqCwGIzq8myH20TE1T/DfW 7VG3aVKwtmMuiZMW2Z61VMqqLSXQq9RFqXzfsl7UTlpdyKklUev+FyVbTrvmghJFAbBIO+aoXhFhK qUfBLUGvDrkwYZhgk83GbXO9a3EGx41RBGiOm3PDFKv9hi2BIIvRXrjcDpUd8vl41yfyGDiwgOE1g T+4F7IBXckWZbvrpg7nkls3nG6TJg4RIArys/6bHy4F4Bg3wxjbla9JtMTn4fngUWOAwo1ElNnivu y6jcSr1wlBUsczo+L0XQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1uwMhF-0000000F5XK-2GBX; Wed, 10 Sep 2025 15:25:21 +0000 Received: from smtp-out1.suse.de ([195.135.223.130]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1uwMhC-0000000F5Vl-48I7 for linux-riscv@lists.infradead.org; Wed, 10 Sep 2025 15:25:20 +0000 Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 69F4B3860B; Wed, 10 Sep 2025 15:25:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1757517914; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1YcUcvdFrQ2ayFwyzcqhwFNl1qTUwgQFOMdRA4aMHF0=; b=PTAN7E6ao2Zaa/hWc4sdJlbP7QwNUsfl+P9juekiBp1axHD/IhSgwosKsyB6lPoS8enk2c v04EKlzzXUNujDDrt/YXz5b+5wVduTaQEOVWPfgIT/uPMZQbn3uVVKR4beQ+tZgt+bW+v4 Oo0BcjR5++TubzsPaxxThU1gT0dkSAE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1757517914; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1YcUcvdFrQ2ayFwyzcqhwFNl1qTUwgQFOMdRA4aMHF0=; b=RBkyf4AULhWmRUBBj40c1wLB7Qa3PAaG19vF5nAlbGENqNZsypODEKW+xxyqXn3y7k/sUI FSJrO0LCvyy2YEAA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1757517914; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1YcUcvdFrQ2ayFwyzcqhwFNl1qTUwgQFOMdRA4aMHF0=; b=PTAN7E6ao2Zaa/hWc4sdJlbP7QwNUsfl+P9juekiBp1axHD/IhSgwosKsyB6lPoS8enk2c v04EKlzzXUNujDDrt/YXz5b+5wVduTaQEOVWPfgIT/uPMZQbn3uVVKR4beQ+tZgt+bW+v4 Oo0BcjR5++TubzsPaxxThU1gT0dkSAE= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1757517914; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1YcUcvdFrQ2ayFwyzcqhwFNl1qTUwgQFOMdRA4aMHF0=; b=RBkyf4AULhWmRUBBj40c1wLB7Qa3PAaG19vF5nAlbGENqNZsypODEKW+xxyqXn3y7k/sUI FSJrO0LCvyy2YEAA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 52D7A13301; Wed, 10 Sep 2025 15:25:14 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id +5XFE1qYwWgvNgAAD6G6ig (envelope-from ); Wed, 10 Sep 2025 15:25:14 +0000 From: Fabian Vogt To: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, Guo Ren , Marvin Friedrich , Alexandre Ghiti , Albert Ou , Palmer Dabbelt , Paul Walmsley , =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= Subject: [PATCH] riscv: kprobes: Fix probe address validation Date: Wed, 10 Sep 2025 17:25:13 +0200 Message-ID: <6191817.lOV4Wx5bFT@fvogt-thinkpad> MIME-Version: 1.0 X-Spamd-Result: default: False [-3.30 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; CTE_CASE(0.50)[]; MID_RHS_NOT_FQDN(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-0.999]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; TO_MATCH_ENVRCPT_ALL(0.00)[]; ARC_NA(0.00)[]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FUZZY_RATELIMITED(0.00)[rspamd.com]; FROM_HAS_DN(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FROM_EQ_ENVFROM(0.00)[]; RCVD_TLS_ALL(0.00)[]; RCPT_COUNT_SEVEN(0.00)[9]; MISSING_XM_UA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[imap1.dmz-prg2.suse.org:helo,suse.com:email,suse.de:email] X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250910_082519_177914_83741405 X-CRM114-Status: GOOD ( 12.18 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org When adding a kprobe such as "p:probe/tcp_sendmsg _text+15392192", arch_check_kprobe would start iterating all instructions starting from _text until the probed address. Not only is this very inefficient, but literal values in there (e.g. left by function patching) are misinterpreted in a way that causes a desync. Fix this by doing it like x86: start the iteration at the closest preceding symbol instead of the given starting point. Fixes: 87f48c7ccc73 ("riscv: kprobe: Fixup kernel panic when probing an illegal position") Signed-off-by: Fabian Vogt Signed-off-by: Marvin Friedrich --- arch/riscv/kernel/probes/kprobes.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c index c0738d6c6498..8723390c7cad 100644 --- a/arch/riscv/kernel/probes/kprobes.c +++ b/arch/riscv/kernel/probes/kprobes.c @@ -49,10 +49,15 @@ static void __kprobes arch_simulate_insn(struct kprobe *p, struct pt_regs *regs) post_kprobe_handler(p, kcb, regs); } -static bool __kprobes arch_check_kprobe(struct kprobe *p) +static bool __kprobes arch_check_kprobe(unsigned long addr) { - unsigned long tmp = (unsigned long)p->addr - p->offset; - unsigned long addr = (unsigned long)p->addr; + unsigned long tmp, offset; + + /* start iterating at the closest preceding symbol */ + if (!kallsyms_lookup_size_offset(addr, NULL, &offset)) + return false; + + tmp = addr - offset; while (tmp <= addr) { if (tmp == addr) @@ -71,7 +76,7 @@ int __kprobes arch_prepare_kprobe(struct kprobe *p) if ((unsigned long)insn & 0x1) return -EILSEQ; - if (!arch_check_kprobe(p)) + if (!arch_check_kprobe((unsigned long)p->addr)) return -EILSEQ; /* copy instruction */ -- 2.51.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv