diff mbox series

[4.19-rt] lib/ubsan: Remove flags from stray ubsan_prolog/epilog() calls

Message ID 1582817850.12738.43.camel@kernel.org
State New
Headers show
Series [4.19-rt] lib/ubsan: Remove flags from stray ubsan_prolog/epilog() calls | expand

Commit Message

Tom Zanussi Feb. 27, 2020, 3:37 p.m. UTC 
When applying the upstream commit 4702c28ac777 [lib/ubsan: Don't
seralize UBSAN report] to 4.14 and building with CONFIG_UBSAN, I got a
compile error and fixed it as below.  Realizing that 4.19 might have
the same problem, I checked and found that it did, which this patch
fixes.

Fixes 4.19-rt commit 73b845faa4ec [lib/ubsan: Don't seralize UBSAN
report].

Signed-off-by: Tom Zanussi <zanussi@kernel.org>
---
 lib/ubsan.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/lib/ubsan.c b/lib/ubsan.c
index 5830cc9a2164..199c75e03469 100644
--- a/lib/ubsan.c
+++ b/lib/ubsan.c
@@ -339,18 +339,17 @@  EXPORT_SYMBOL(__ubsan_handle_type_mismatch_v1);
 void __ubsan_handle_vla_bound_not_positive(struct vla_bound_data *data,
 					void *bound)
 {
-	unsigned long flags;
 	char bound_str[VALUE_LENGTH];
 
 	if (suppress_report(&data->location))
 		return;
 
-	ubsan_prologue(&data->location, &flags);
+	ubsan_prologue(&data->location);
 
 	val_to_string(bound_str, sizeof(bound_str), data->type, bound);
 	pr_err("variable length array bound value %s <= 0\n", bound_str);
 
-	ubsan_epilogue(&flags);
+	ubsan_epilogue();
 }
 EXPORT_SYMBOL(__ubsan_handle_vla_bound_not_positive);