* [PATCH] ubsan: add prototypes for internal functions
@ 2023-05-17 12:50 Arnd Bergmann
2023-05-18 1:43 ` Fangrui Song
2023-05-30 22:48 ` Kees Cook
0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2023-05-17 12:50 UTC (permalink / raw)
To: kasan-dev
Cc: Arnd Bergmann, Kees Cook, Mukesh Ojha, Mark Rutland, Ingo Molnar,
Luis Chamberlain, Peter Zijlstra, Fangrui Song, Ard Biesheuvel,
linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
Most of the functions in ubsan that are only called from generated
code don't have a prototype, which W=1 builds warn about:
lib/ubsan.c:226:6: error: no previous prototype for '__ubsan_handle_divrem_overflow' [-Werror=missing-prototypes]
lib/ubsan.c:307:6: error: no previous prototype for '__ubsan_handle_type_mismatch' [-Werror=missing-prototypes]
lib/ubsan.c:321:6: error: no previous prototype for '__ubsan_handle_type_mismatch_v1' [-Werror=missing-prototypes]
lib/ubsan.c:335:6: error: no previous prototype for '__ubsan_handle_out_of_bounds' [-Werror=missing-prototypes]
lib/ubsan.c:352:6: error: no previous prototype for '__ubsan_handle_shift_out_of_bounds' [-Werror=missing-prototypes]
lib/ubsan.c:394:6: error: no previous prototype for '__ubsan_handle_builtin_unreachable' [-Werror=missing-prototypes]
lib/ubsan.c:404:6: error: no previous prototype for '__ubsan_handle_load_invalid_value' [-Werror=missing-prototypes]
Add prototypes for all of these to lib/ubsan.h, and remove the
one that was already present in ubsan.c.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
lib/ubsan.c | 3 ---
lib/ubsan.h | 11 +++++++++++
2 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/lib/ubsan.c b/lib/ubsan.c
index e2cc4a799312..3f90810f9f42 100644
--- a/lib/ubsan.c
+++ b/lib/ubsan.c
@@ -423,9 +423,6 @@ void __ubsan_handle_load_invalid_value(void *_data, void *val)
}
EXPORT_SYMBOL(__ubsan_handle_load_invalid_value);
-void __ubsan_handle_alignment_assumption(void *_data, unsigned long ptr,
- unsigned long align,
- unsigned long offset);
void __ubsan_handle_alignment_assumption(void *_data, unsigned long ptr,
unsigned long align,
unsigned long offset)
diff --git a/lib/ubsan.h b/lib/ubsan.h
index cc5cb94895a6..5d99ab81913b 100644
--- a/lib/ubsan.h
+++ b/lib/ubsan.h
@@ -124,4 +124,15 @@ typedef s64 s_max;
typedef u64 u_max;
#endif
+void __ubsan_handle_divrem_overflow(void *_data, void *lhs, void *rhs);
+void __ubsan_handle_type_mismatch(struct type_mismatch_data *data, void *ptr);
+void __ubsan_handle_type_mismatch_v1(void *_data, void *ptr);
+void __ubsan_handle_out_of_bounds(void *_data, void *index);
+void __ubsan_handle_shift_out_of_bounds(void *_data, void *lhs, void *rhs);
+void __ubsan_handle_builtin_unreachable(void *_data);
+void __ubsan_handle_load_invalid_value(void *_data, void *val);
+void __ubsan_handle_alignment_assumption(void *_data, unsigned long ptr,
+ unsigned long align,
+ unsigned long offset);
+
#endif
--
2.39.2
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] ubsan: add prototypes for internal functions
2023-05-17 12:50 [PATCH] ubsan: add prototypes for internal functions Arnd Bergmann
@ 2023-05-18 1:43 ` Fangrui Song
2023-05-30 22:48 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Fangrui Song @ 2023-05-18 1:43 UTC (permalink / raw)
To: Arnd Bergmann
Cc: kasan-dev, Arnd Bergmann, Kees Cook, Mukesh Ojha, Mark Rutland,
Ingo Molnar, Luis Chamberlain, Peter Zijlstra, Ard Biesheuvel,
linux-kernel
On 2023-05-17, Arnd Bergmann wrote:
>From: Arnd Bergmann <arnd@arndb.de>
>
>Most of the functions in ubsan that are only called from generated
>code don't have a prototype, which W=1 builds warn about:
>
>lib/ubsan.c:226:6: error: no previous prototype for '__ubsan_handle_divrem_overflow' [-Werror=missing-prototypes]
>lib/ubsan.c:307:6: error: no previous prototype for '__ubsan_handle_type_mismatch' [-Werror=missing-prototypes]
>lib/ubsan.c:321:6: error: no previous prototype for '__ubsan_handle_type_mismatch_v1' [-Werror=missing-prototypes]
>lib/ubsan.c:335:6: error: no previous prototype for '__ubsan_handle_out_of_bounds' [-Werror=missing-prototypes]
>lib/ubsan.c:352:6: error: no previous prototype for '__ubsan_handle_shift_out_of_bounds' [-Werror=missing-prototypes]
>lib/ubsan.c:394:6: error: no previous prototype for '__ubsan_handle_builtin_unreachable' [-Werror=missing-prototypes]
>lib/ubsan.c:404:6: error: no previous prototype for '__ubsan_handle_load_invalid_value' [-Werror=missing-prototypes]
>
>Add prototypes for all of these to lib/ubsan.h, and remove the
>one that was already present in ubsan.c.
>
>Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>---
> lib/ubsan.c | 3 ---
> lib/ubsan.h | 11 +++++++++++
> 2 files changed, 11 insertions(+), 3 deletions(-)
>
>diff --git a/lib/ubsan.c b/lib/ubsan.c
>index e2cc4a799312..3f90810f9f42 100644
>--- a/lib/ubsan.c
>+++ b/lib/ubsan.c
>@@ -423,9 +423,6 @@ void __ubsan_handle_load_invalid_value(void *_data, void *val)
> }
> EXPORT_SYMBOL(__ubsan_handle_load_invalid_value);
>
>-void __ubsan_handle_alignment_assumption(void *_data, unsigned long ptr,
>- unsigned long align,
>- unsigned long offset);
> void __ubsan_handle_alignment_assumption(void *_data, unsigned long ptr,
> unsigned long align,
> unsigned long offset)
>diff --git a/lib/ubsan.h b/lib/ubsan.h
>index cc5cb94895a6..5d99ab81913b 100644
>--- a/lib/ubsan.h
>+++ b/lib/ubsan.h
>@@ -124,4 +124,15 @@ typedef s64 s_max;
> typedef u64 u_max;
> #endif
>
>+void __ubsan_handle_divrem_overflow(void *_data, void *lhs, void *rhs);
>+void __ubsan_handle_type_mismatch(struct type_mismatch_data *data, void *ptr);
>+void __ubsan_handle_type_mismatch_v1(void *_data, void *ptr);
>+void __ubsan_handle_out_of_bounds(void *_data, void *index);
>+void __ubsan_handle_shift_out_of_bounds(void *_data, void *lhs, void *rhs);
>+void __ubsan_handle_builtin_unreachable(void *_data);
>+void __ubsan_handle_load_invalid_value(void *_data, void *val);
>+void __ubsan_handle_alignment_assumption(void *_data, unsigned long ptr,
>+ unsigned long align,
>+ unsigned long offset);
>+
> #endif
>--
>2.39.2
Thanks. I've checked that these signatures match the definitions in
lib/ubsan.c and the order matches as well.
Reviewed-by: Fangrui Song <maskray@google.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] ubsan: add prototypes for internal functions
2023-05-17 12:50 [PATCH] ubsan: add prototypes for internal functions Arnd Bergmann
2023-05-18 1:43 ` Fangrui Song
@ 2023-05-30 22:48 ` Kees Cook
1 sibling, 0 replies; 3+ messages in thread
From: Kees Cook @ 2023-05-30 22:48 UTC (permalink / raw)
To: arnd, kasan-dev
Cc: Kees Cook, peterz, ardb, maskray, mingo, mark.rutland,
Arnd Bergmann, linux-kernel, mcgrof, quic_mojha
On Wed, 17 May 2023 14:50:34 +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Most of the functions in ubsan that are only called from generated
> code don't have a prototype, which W=1 builds warn about:
>
> lib/ubsan.c:226:6: error: no previous prototype for '__ubsan_handle_divrem_overflow' [-Werror=missing-prototypes]
> lib/ubsan.c:307:6: error: no previous prototype for '__ubsan_handle_type_mismatch' [-Werror=missing-prototypes]
> lib/ubsan.c:321:6: error: no previous prototype for '__ubsan_handle_type_mismatch_v1' [-Werror=missing-prototypes]
> lib/ubsan.c:335:6: error: no previous prototype for '__ubsan_handle_out_of_bounds' [-Werror=missing-prototypes]
> lib/ubsan.c:352:6: error: no previous prototype for '__ubsan_handle_shift_out_of_bounds' [-Werror=missing-prototypes]
> lib/ubsan.c:394:6: error: no previous prototype for '__ubsan_handle_builtin_unreachable' [-Werror=missing-prototypes]
> lib/ubsan.c:404:6: error: no previous prototype for '__ubsan_handle_load_invalid_value' [-Werror=missing-prototypes]
>
> [...]
Applied to for-next/hardening, thanks!
[1/1] ubsan: add prototypes for internal functions
https://git.kernel.org/kees/c/d25ad53db59e
--
Kees Cook
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-30 22:49 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-17 12:50 [PATCH] ubsan: add prototypes for internal functions Arnd Bergmann
2023-05-18 1:43 ` Fangrui Song
2023-05-30 22:48 ` Kees Cook
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox