From nobody Mon Dec 1 22:37:11 2025 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2DBB423C513 for ; Fri, 28 Nov 2025 14:00:38 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764338440; cv=none; b=tsL8AVCOfX1bp9kiaGK2++wQY8ByO/YkQbutOuqlWfum8tCmY4XejgcczCfet0ZH+QVhAkSAsajAiexK0+LoTQ+QJhHDvCy2lPrssSYiXr7wHAR9QdlAuz12zD9YKxvuMISTaswgFWQaZQ00Ogu8N1NOfyHy2hVdCxlp4PAXcOE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764338440; c=relaxed/simple; bh=8+22zrEZbmRi2hZ0IxfCnN+FjDUhaZxI/uAGmgwFPqU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jAOjPfffXZdNkagJzWcHBgXhQmrvGrtRdRpaMZNE1E8zUksS7dLjJG2J1SQHjw31nsz9i88nhOejMzWp9dftHVb/F/DFSZZiTlT2UoP4VbF67eTs25+YrAno4cR/qOgxw+qPSSCfRLQEunniXDL8z3cUW4A5OUXZhSlgqqJUYjQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=Dpzdk+/O; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b=OQG9WMMK; arc=none smtp.client-ip=195.135.223.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="Dpzdk+/O"; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="OQG9WMMK" Received: from pathway.suse.cz (unknown [IPv6:2a07:de40:b2bf:1b::12bd]) by smtp-out2.suse.de (Postfix) with ESMTP id 970C25BE7B; Fri, 28 Nov 2025 14:00:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1764338435; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KpZ66NsDo6oRbcdThq5SnZKXC4wNbdElMjhexsMICjA=; b=Dpzdk+/O54oSQ9dMN/KDzMEbXsseH88A2fBkQCeDvzS7x2Ofrsin3lCLMLNlThw/c9Rkw4 XZ3PEMfgz1seJBPGhlzp4Ul09eR1V7JR2onETDwf+E6ITQPOfPnp6FBLkVbLXVebVaKpBv Srd4VzNTVmKkx1N4Kj6A0ubDYo75J+w= Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.com header.s=susede1 header.b=OQG9WMMK DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1764338434; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KpZ66NsDo6oRbcdThq5SnZKXC4wNbdElMjhexsMICjA=; b=OQG9WMMKXUPh2j0SoCAWkFp3kPyM+ck+Mba6KP5sMyclKfhKTrmFQ1C2A4YhwGSGeMW94Z AsBDc1pz1kXdoXmmPd99BK63IpU1obyUDMFCG+CwlllfUdt21FC/jAs/oKAMaLRv2nGNmP JvGtnGQiPSpEEj3xRiK4TYuiycSu7pI= From: Petr Mladek To: Petr Pavlu , Steven Rostedt , Alexei Starovoitov , Andrew Morton , Kees Cook Cc: Aaron Tomlin , Daniel Borkmann , John Fastabend , Masami Hiramatsu , Mark Rutland , Luis Chamberlain , Daniel Gomez , Sami Tolvanen , linux-kernel@vger.kernel.org, bpf@vger.kernel.org, linux-modules@vger.kernel.org, linux-trace-kernel@vger.kernel.org, Petr Mladek Subject: [PATCH v3 6/7] kallsyms/ftrace: Set module buildid in ftrace_mod_address_lookup() Date: Fri, 28 Nov 2025 14:59:19 +0100 Message-ID: <20251128135920.217303-7-pmladek@suse.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251128135920.217303-1-pmladek@suse.com> References: <20251128135920.217303-1-pmladek@suse.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Spamd-Result: default: False [15.11 / 50.00]; SPAM_FLAG(5.00)[]; NEURAL_SPAM_LONG(3.50)[1.000]; BAYES_HAM(-3.00)[100.00%]; HFILTER_HOSTNAME_UNKNOWN(2.50)[]; RDNS_NONE(2.00)[]; SUSPICIOUS_RECIPS(1.50)[]; ONCE_RECEIVED(1.20)[]; HFILTER_HELO_IP_A(1.00)[pathway.suse.cz]; MID_CONTAINS_FROM(1.00)[]; R_MISSING_CHARSET(0.50)[]; HFILTER_HELO_NORES_A_OR_MX(0.30)[pathway.suse.cz]; R_DKIM_ALLOW(-0.20)[suse.com:s=susede1]; MIME_GOOD(-0.10)[text/plain]; NEURAL_HAM_SHORT(-0.08)[-0.381]; MX_GOOD(-0.01)[]; ARC_NA(0.00)[]; DIRECT_TO_MX(0.00)[git-send-email 2.52.0]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+]; FROM_HAS_DN(0.00)[]; DKIM_SIGNED(0.00)[suse.com:s=susede1]; RCPT_COUNT_TWELVE(0.00)[18]; FUZZY_RATELIMITED(0.00)[rspamd.com]; RCVD_COUNT_ZERO(0.00)[0]; TAGGED_RCPT(0.00)[]; FREEMAIL_CC(0.00)[atomlin.com,iogearbox.net,gmail.com,kernel.org,arm.com,google.com,vger.kernel.org,suse.com]; DKIM_TRACE(0.00)[suse.com:+]; R_RATELIMIT(0.00)[to_ip_from(RL6jpahug3dm5x93mmnjuwit91)]; DBL_BLOCKED_OPENRESOLVER(0.00)[goodmis.org:email,suse.com:mid,suse.com:dkim,suse.com:email,pathway.suse.cz:helo,atomlin.com:email]; TO_DN_SOME(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b2bf:1b::12bd:from]; SPAMHAUS_XBL(0.00)[2a07:de40:b2bf:1b::12bd:from]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FREEMAIL_ENVRCPT(0.00)[gmail.com] X-Spamd-Bar: +++++++++++++++ X-Rspamd-Queue-Id: 970C25BE7B X-Spam-Flag: YES X-Spam-Score: 15.11 X-Spam-Level: *************** X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: add header X-Spam: Yes Content-Type: text/plain; charset="utf-8" __sprint_symbol() might access an invalid pointer when kallsyms_lookup_buildid() returns a symbol found by ftrace_mod_address_lookup(). The ftrace lookup function must set both @modname and @modbuildid the same way as module_address_lookup(). Fixes: 9294523e3768 ("module: add printk formats to add module build ID to = stacktraces") Reviewed-by: Aaron Tomlin Acked-by: Steven Rostedt (Google) Signed-off-by: Petr Mladek --- include/linux/ftrace.h | 6 ++++-- kernel/kallsyms.c | 4 ++-- kernel/trace/ftrace.c | 5 ++++- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/linux/ftrace.h b/include/linux/ftrace.h index 07f8c309e432..9cc60e2506af 100644 --- a/include/linux/ftrace.h +++ b/include/linux/ftrace.h @@ -87,11 +87,13 @@ struct ftrace_hash; defined(CONFIG_DYNAMIC_FTRACE) int ftrace_mod_address_lookup(unsigned long addr, unsigned long *size, - unsigned long *off, char **modname, char *sym); + unsigned long *off, char **modname, + const unsigned char **modbuildid, char *sym); #else static inline int ftrace_mod_address_lookup(unsigned long addr, unsigned long *size, - unsigned long *off, char **modname, char *sym) + unsigned long *off, char **modname, + const unsigned char **modbuildid, char *sym) { return 0; } diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c index 97b92fc8871d..5bc1646f8639 100644 --- a/kernel/kallsyms.c +++ b/kernel/kallsyms.c @@ -386,8 +386,8 @@ static int kallsyms_lookup_buildid(unsigned long addr, ret =3D bpf_address_lookup(addr, symbolsize, offset, namebuf); =20 if (!ret) - ret =3D ftrace_mod_address_lookup(addr, symbolsize, - offset, modname, namebuf); + ret =3D ftrace_mod_address_lookup(addr, symbolsize, offset, + modname, modbuildid, namebuf); =20 return ret; } diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c index 59cfacb8a5bb..d0001dffd98a 100644 --- a/kernel/trace/ftrace.c +++ b/kernel/trace/ftrace.c @@ -7708,7 +7708,8 @@ ftrace_func_address_lookup(struct ftrace_mod_map *mod= _map, =20 int ftrace_mod_address_lookup(unsigned long addr, unsigned long *size, - unsigned long *off, char **modname, char *sym) + unsigned long *off, char **modname, + const unsigned char **modbuildid, char *sym) { struct ftrace_mod_map *mod_map; int ret =3D 0; @@ -7720,6 +7721,8 @@ ftrace_mod_address_lookup(unsigned long addr, unsigne= d long *size, if (ret) { if (modname) *modname =3D mod_map->mod->name; + if (modbuildid) + *modbuildid =3D module_buildid(mod_map->mod); break; } } --=20 2.52.0