lib/ubsan: Remove flags from stray ubsan_prolog/epilog() calls

PATCH New Tom Zanussi 1 participant 1 message Feb 27, 2020

Subsystems (2)

Library code Ubsan

lore

Share & tools

lore

Tom Zanussi

author

2020-02-27 15:37 UTC #0 lore raw

PATCH 1/1 lib/ubsan: Remove flags from stray ubsan_prolog/epilog() calls

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 <[email protected]>

---
 lib/ubsan.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

lib/ubsan.c +2 -3

index 5830cc9a2164..199c75e03469 100644
@@ -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);

Signature · 1 line

2.14.1