linux-kernel - [PATCH] ftrace: makes ops_references

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Tue, 9 Aug 2022 23:56:48 +0000
From:   Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
To:     Steven Rostedt <rostedt@...dmis.org>,
        Ingo Molnar <mingo@...hat.com>, Song Liu <song@...nel.org>,
        Daniel Borkmann <daniel@...earbox.net>
Cc:     linux-kernel@...r.kernel.org
Subject: [PATCH] ftrace: makes ops_references_rec() inline


commit 53cd885bc5c3e ("ftrace: Allow IPMODIFY and DIRECT ops on the
same function") removes "inline" from ops_references_rec(),
thus we will get below error if .config doesn't have CONFIG_MODULES.

  CC      kernel/trace/ftrace.o
${linux}/kernel/trace/ftrace.c:3149:1: error: 'ops_references_rec' \
defined but not used [-Werror=unused-function]
 3149 | ops_references_rec(struct ftrace_ops *ops, struct dyn_ftrace *rec)
      | ^~~~~~~~~~~~~~~~~~
cc1: all warnings being treated as errors
make[2]: *** [${linux}/scripts/Makefile.build:249: kernel/trace/ftrace.o] error 1
make[1]: *** [${linux}/scripts/Makefile.build:466: kernel/trace] error 2
make: *** [/opt/disk_cd/morimoto/linux/Makefile:1843: kernel] error 2

This patch adds "inline" again, and fixes the issue.

Fixes:  53cd885bc5c3e ("ftrace: Allow IPMODIFY and DIRECT ops on the same function")
CC: Song Liu <song@...nel.org>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@...esas.com>
---
 kernel/trace/ftrace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index bc921a3f7ea8..b52782857f97 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -3145,7 +3145,7 @@ ops_references_ip(struct ftrace_ops *ops, unsigned long ip)
  * If the ops does not trace the current record function, skip it.
  * If the ops ignores the function via notrace filter, skip it.
  */
-static bool
+static inline bool
 ops_references_rec(struct ftrace_ops *ops, struct dyn_ftrace *rec)
 {
 	return ops_references_ip(ops, rec->ip);
-- 
2.25.1