Skip to contentSkip to conversation

kallsyms: Change func signature for cleanup_symbol_name()

PATCH Applied Yonghong Song 4 participants 4 messages Aug 25, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kallsyms: Change func signature for cleanup_symbol_name()

All users of cleanup_symbol_name() do not use the return value. So let us change the return value of cleanup_symbol_name() to 'void' to reflect its usage pattern.

---
 kernel/kallsyms.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

NOTE:
This patch needs to be applied after the following patch:
https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git/commit/?id=33f0467fe069

kernel/kallsyms.c +4 -6
index e12d26c10dba..18edd57b5fe8 100644
@@ -163,12 +163,12 @@ unsigned long kallsyms_sym_address(int idx)
 	return kallsyms_relative_base - 1 - kallsyms_offsets[idx];
 }
 
-static bool cleanup_symbol_name(char *s)
+static void cleanup_symbol_name(char *s)
 {
 	char *res;
 
 	if (!IS_ENABLED(CONFIG_LTO_CLANG))
-		return false;
+		return;
 
 	/*
 	 * LLVM appends various suffixes for local functions and variables that
@@ -178,12 +178,10 @@ static bool cleanup_symbol_name(char *s)
 	 * - foo.llvm.[0-9a-f]+
 	 */
 	res = strstr(s, ".llvm.");
-	if (res) {
+	if (res)
 		*res = '\0';
-		return true;
-	}
 
-	return false;
+	return;
 }
 
 static int compare_symbol_name(const char *name, char *namebuf)
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Yonghong Song

All users of cleanup_symbol_name() do not use the return value. So let us change the return value of cleanup_symbol_name() to 'void' to reflect its usage pattern.

LGTM; thanks!

Quoted 45 lines
---
 kernel/kallsyms.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

NOTE:
This patch needs to be applied after the following patch:
https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git/commit/?id=33f0467fe069

kernel/kallsyms.c +4 -7
index e12d26c10dba..18edd57b5fe8 100644
@@ -163,12 +163,12 @@ unsigned long kallsyms_sym_address(int idx)
        return kallsyms_relative_base - 1 - kallsyms_offsets[idx];
 }
 
-static bool cleanup_symbol_name(char *s)
+static void cleanup_symbol_name(char *s)
 {
        char *res;
 
        if (!IS_ENABLED(CONFIG_LTO_CLANG))
-               return false;
+               return;
 
        /*
         * LLVM appends various suffixes for local functions and variables that
@@ -178,12 +178,10 @@ static bool cleanup_symbol_name(char *s)
         * - foo.llvm.[0-9a-f]+
         */
        res = strstr(s, ".llvm.");
-       if (res) {
+       if (res)
                *res = '\0';
-               return true;
-       }
 
-       return false;
+       return;
 }
 
 static int compare_symbol_name(const char *name, char *namebuf)
--

2.34.1

Signature · 2 lines
Thanks,
~Nick Desaulniers
Applied
#3 lore raw
In reply to Yonghong Song
Quoted 5 lines · Yonghong Song

All users of cleanup_symbol_name() do not use the return value. So let us change the return value of cleanup_symbol_name() to 'void' to reflect its usage pattern.

Applied to for-next/hardening, thanks!

[1/1] kallsyms: Change func signature for cleanup_symbol_name()

      https://git.kernel.org/kees/c/76903a964874

Take care,

Signature · 1 line
Kees Cook