diff options
Diffstat (limited to '')
| -rw-r--r-- | debian/patches-rt/0322-lib-ubsan-Remove-flags-parameter-from-calls-to-ubsan.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/debian/patches-rt/0322-lib-ubsan-Remove-flags-parameter-from-calls-to-ubsan.patch b/debian/patches-rt/0322-lib-ubsan-Remove-flags-parameter-from-calls-to-ubsan.patch new file mode 100644 index 000000000..709e7d601 --- /dev/null +++ b/debian/patches-rt/0322-lib-ubsan-Remove-flags-parameter-from-calls-to-ubsan.patch @@ -0,0 +1,57 @@ +From d107484fb77558e58c28e33e5642d7a11f05dfea Mon Sep 17 00:00:00 2001 +From: Tiejun Chen <tiejunc@vmware.com> +Date: Mon, 30 Mar 2020 18:45:23 -0400 +Subject: [PATCH 322/347] lib/ubsan: Remove flags parameter from calls to + ubsan_prologue() and ubsan_epilogue() +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz + +Fails to build with CONFIG_UBSAN=y + +lib/ubsan.c: In function '__ubsan_handle_vla_bound_not_positive': +lib/ubsan.c:348:2: error: too many arguments to function 'ubsan_prologue' + ubsan_prologue(&data->location, &flags); + ^~~~~~~~~~~~~~ +lib/ubsan.c:146:13: note: declared here + static void ubsan_prologue(struct source_location *location) + ^~~~~~~~~~~~~~ +lib/ubsan.c:353:2: error: too many arguments to function 'ubsan_epilogue' + ubsan_epilogue(&flags); + ^~~~~~~~~~~~~~ +lib/ubsan.c:155:13: note: declared here + static void ubsan_epilogue(void) + ^~~~~~~~~~~~~~ + +Signed-off-by: Tiejun Chen <tiejunc@vmware.com> +Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> +--- + lib/ubsan.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +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); + +-- +2.36.1 + |