mirror of
https://github.com/LadybirdBrowser/ladybird.git
synced 2025-06-10 18:10:56 +09:00
Kernel: Switch KUBSAN prints to use critical_dmesgln instead of dbgln
This allows to KUBSAN to print correctly in strictier memory conditions. This patch also removes some useless curly braces around single line ifs.
This commit is contained in:
Idan Horowitz
Brian Gianforcaro
parent
5f4a67434c
commit
b2f0697afc
Notes:
sideshowbarker
2024-07-17 22:23:07 +09:00
Author: https://github.com/IdanHo
Commit: b2f0697afc
Pull-request: https://github.com/SerenityOS/serenity/pull/11318
Reviewed-by: https://github.com/bgianfo ✅
1 changed files with 40 additions and 50 deletions
|
|
@ -18,14 +18,13 @@ extern "C" {
|
|||
|
||||
static void print_location(const SourceLocation& location)
|
||||
{
|
||||
if (!location.filename()) {
|
||||
dbgln("KUBSAN: in unknown file");
|
||||
} else {
|
||||
dbgln("KUBSAN: at {}, line {}, column: {}", location.filename(), location.line(), location.column());
|
||||
}
|
||||
if (!location.filename())
|
||||
critical_dmesgln("KUBSAN: in unknown file");
|
||||
else
|
||||
critical_dmesgln("KUBSAN: at {}, line {}, column: {}", location.filename(), location.line(), location.column());
|
||||
dump_backtrace();
|
||||
if (g_ubsan_is_deadly) {
|
||||
dbgln("UB is configured to be deadly, halting the system.");
|
||||
critical_dmesgln("UB is configured to be deadly, halting the system.");
|
||||
Processor::halt();
|
||||
}
|
||||
}
|
||||
|
|
@ -33,49 +32,49 @@ static void print_location(const SourceLocation& location)
|
|||
void __ubsan_handle_load_invalid_value(const InvalidValueData&, ValueHandle) __attribute__((used));
|
||||
void __ubsan_handle_load_invalid_value(const InvalidValueData& data, ValueHandle)
|
||||
{
|
||||
dbgln("KUBSAN: load-invalid-value: {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
critical_dmesgln("KUBSAN: load-invalid-value: {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_nonnull_arg(const NonnullArgData&) __attribute__((used));
|
||||
void __ubsan_handle_nonnull_arg(const NonnullArgData& data)
|
||||
{
|
||||
dbgln("KUBSAN: null pointer passed as argument {}, which is declared to never be null", data.argument_index);
|
||||
critical_dmesgln("KUBSAN: null pointer passed as argument {}, which is declared to never be null", data.argument_index);
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_nullability_arg(const NonnullArgData&) __attribute__((used));
|
||||
void __ubsan_handle_nullability_arg(const NonnullArgData& data)
|
||||
{
|
||||
dbgln("KUBSAN: null pointer passed as argument {}, which is declared to never be null", data.argument_index);
|
||||
critical_dmesgln("KUBSAN: null pointer passed as argument {}, which is declared to never be null", data.argument_index);
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_nonnull_return_v1(const NonnullReturnData&, const SourceLocation&) __attribute__((used));
|
||||
void __ubsan_handle_nonnull_return_v1(const NonnullReturnData&, const SourceLocation& location)
|
||||
{
|
||||
dbgln("KUBSAN: null pointer return from function declared to never return null");
|
||||
critical_dmesgln("KUBSAN: null pointer return from function declared to never return null");
|
||||
print_location(location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_nullability_return_v1(const NonnullReturnData& data, const SourceLocation& location) __attribute__((used));
|
||||
void __ubsan_handle_nullability_return_v1(const NonnullReturnData&, const SourceLocation& location)
|
||||
{
|
||||
dbgln("KUBSAN: null pointer return from function declared to never return null");
|
||||
critical_dmesgln("KUBSAN: null pointer return from function declared to never return null");
|
||||
print_location(location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_vla_bound_not_positive(const VLABoundData&, ValueHandle) __attribute__((used));
|
||||
void __ubsan_handle_vla_bound_not_positive(const VLABoundData& data, ValueHandle)
|
||||
{
|
||||
dbgln("KUBSAN: VLA bound not positive {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
critical_dmesgln("KUBSAN: VLA bound not positive {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_add_overflow(const OverflowData&, ValueHandle lhs, ValueHandle rhs) __attribute__((used));
|
||||
void __ubsan_handle_add_overflow(const OverflowData& data, ValueHandle, ValueHandle)
|
||||
{
|
||||
dbgln("KUBSAN: addition overflow, {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
critical_dmesgln("KUBSAN: addition overflow, {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
|
||||
print_location(data.location);
|
||||
}
|
||||
|
|
@ -83,7 +82,7 @@ void __ubsan_handle_add_overflow(const OverflowData& data, ValueHandle, ValueHan
|
|||
void __ubsan_handle_sub_overflow(const OverflowData&, ValueHandle lhs, ValueHandle rhs) __attribute__((used));
|
||||
void __ubsan_handle_sub_overflow(const OverflowData& data, ValueHandle, ValueHandle)
|
||||
{
|
||||
dbgln("KUBSAN: subtraction overflow, {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
critical_dmesgln("KUBSAN: subtraction overflow, {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
|
||||
print_location(data.location);
|
||||
}
|
||||
|
|
@ -91,7 +90,7 @@ void __ubsan_handle_sub_overflow(const OverflowData& data, ValueHandle, ValueHan
|
|||
void __ubsan_handle_negate_overflow(const OverflowData&, ValueHandle) __attribute__((used));
|
||||
void __ubsan_handle_negate_overflow(const OverflowData& data, ValueHandle)
|
||||
{
|
||||
dbgln("KUBSAN: negation overflow, {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
critical_dmesgln("KUBSAN: negation overflow, {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
|
||||
print_location(data.location);
|
||||
}
|
||||
|
|
@ -99,28 +98,28 @@ void __ubsan_handle_negate_overflow(const OverflowData& data, ValueHandle)
|
|||
void __ubsan_handle_mul_overflow(const OverflowData&, ValueHandle lhs, ValueHandle rhs) __attribute__((used));
|
||||
void __ubsan_handle_mul_overflow(const OverflowData& data, ValueHandle, ValueHandle)
|
||||
{
|
||||
dbgln("KUBSAN: multiplication overflow, {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
critical_dmesgln("KUBSAN: multiplication overflow, {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_shift_out_of_bounds(const ShiftOutOfBoundsData&, ValueHandle lhs, ValueHandle rhs) __attribute__((used));
|
||||
void __ubsan_handle_shift_out_of_bounds(const ShiftOutOfBoundsData& data, ValueHandle, ValueHandle)
|
||||
{
|
||||
dbgln("KUBSAN: shift out of bounds, {} ({}-bit) shifted by {} ({}-bit)", data.lhs_type.name(), data.lhs_type.bit_width(), data.rhs_type.name(), data.rhs_type.bit_width());
|
||||
critical_dmesgln("KUBSAN: shift out of bounds, {} ({}-bit) shifted by {} ({}-bit)", data.lhs_type.name(), data.lhs_type.bit_width(), data.rhs_type.name(), data.rhs_type.bit_width());
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_divrem_overflow(const OverflowData&, ValueHandle lhs, ValueHandle rhs) __attribute__((used));
|
||||
void __ubsan_handle_divrem_overflow(const OverflowData& data, ValueHandle, ValueHandle)
|
||||
{
|
||||
dbgln("KUBSAN: divrem overflow, {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
critical_dmesgln("KUBSAN: divrem overflow, {} ({}-bit)", data.type.name(), data.type.bit_width());
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_out_of_bounds(const OutOfBoundsData&, ValueHandle) __attribute__((used));
|
||||
void __ubsan_handle_out_of_bounds(const OutOfBoundsData& data, ValueHandle)
|
||||
{
|
||||
dbgln("KUBSAN: out of bounds access into array of {} ({}-bit), index type {} ({}-bit)", data.array_type.name(), data.array_type.bit_width(), data.index_type.name(), data.index_type.bit_width());
|
||||
critical_dmesgln("KUBSAN: out of bounds access into array of {} ({}-bit), index type {} ({}-bit)", data.array_type.name(), data.array_type.bit_width(), data.index_type.name(), data.index_type.bit_width());
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
|
|
@ -145,13 +144,12 @@ void __ubsan_handle_type_mismatch_v1(const TypeMismatchData& data, ValueHandle p
|
|||
FlatPtr alignment = (FlatPtr)1 << data.log_alignment;
|
||||
auto kind = kinds[data.type_check_kind];
|
||||
|
||||
if (!ptr) {
|
||||
dbgln("KUBSAN: {} null pointer of type {}", kind, data.type.name());
|
||||
} else if ((FlatPtr)ptr & (alignment - 1)) {
|
||||
dbgln("KUBSAN: {} misaligned address {:p} of type {}", kind, ptr, data.type.name());
|
||||
} else {
|
||||
dbgln("KUBSAN: {} address {:p} with insufficient space for type {}", kind, ptr, data.type.name());
|
||||
}
|
||||
if (!ptr)
|
||||
critical_dmesgln("KUBSAN: {} null pointer of type {}", kind, data.type.name());
|
||||
else if ((FlatPtr)ptr & (alignment - 1))
|
||||
critical_dmesgln("KUBSAN: {} misaligned address {:p} of type {}", kind, ptr, data.type.name());
|
||||
else
|
||||
critical_dmesgln("KUBSAN: {} address {:p} with insufficient space for type {}", kind, ptr, data.type.name());
|
||||
|
||||
print_location(data.location);
|
||||
}
|
||||
|
|
@ -159,16 +157,10 @@ void __ubsan_handle_type_mismatch_v1(const TypeMismatchData& data, ValueHandle p
|
|||
void __ubsan_handle_alignment_assumption(const AlignmentAssumptionData&, ValueHandle, ValueHandle, ValueHandle) __attribute__((used));
|
||||
void __ubsan_handle_alignment_assumption(const AlignmentAssumptionData& data, ValueHandle pointer, ValueHandle alignment, ValueHandle offset)
|
||||
{
|
||||
if (offset) {
|
||||
dbgln(
|
||||
"KUBSAN: assumption of {:p} byte alignment (with offset of {:p} byte) for pointer {:p}"
|
||||
"of type {} failed",
|
||||
alignment, offset, pointer, data.type.name());
|
||||
} else {
|
||||
dbgln("KUBSAN: assumption of {:p} byte alignment for pointer {:p}"
|
||||
"of type {} failed",
|
||||
alignment, pointer, data.type.name());
|
||||
}
|
||||
if (offset)
|
||||
critical_dmesgln("KUBSAN: assumption of {:p} byte alignment (with offset of {:p} byte) for pointer {:p} of type {} failed", alignment, offset, pointer, data.type.name());
|
||||
else
|
||||
critical_dmesgln("KUBSAN: assumption of {:p} byte alignment for pointer {:p} of type {} failed", alignment, pointer, data.type.name());
|
||||
|
||||
print_location(data.location);
|
||||
}
|
||||
|
|
@ -176,14 +168,14 @@ void __ubsan_handle_alignment_assumption(const AlignmentAssumptionData& data, Va
|
|||
void __ubsan_handle_builtin_unreachable(const UnreachableData&) __attribute__((used));
|
||||
void __ubsan_handle_builtin_unreachable(const UnreachableData& data)
|
||||
{
|
||||
dbgln("KUBSAN: execution reached an unreachable program point");
|
||||
critical_dmesgln("KUBSAN: execution reached an unreachable program point");
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_missing_return(const UnreachableData&) __attribute__((used));
|
||||
void __ubsan_handle_missing_return(const UnreachableData& data)
|
||||
{
|
||||
dbgln("KUBSAN: execution reached the end of a value-returning function without returning a value");
|
||||
critical_dmesgln("KUBSAN: execution reached the end of a value-returning function without returning a value");
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
|
|
@ -192,30 +184,28 @@ void __ubsan_handle_implicit_conversion(const ImplicitConversionData& data, Valu
|
|||
{
|
||||
const char* src_signed = data.from_type.is_signed() ? "" : "un";
|
||||
const char* dst_signed = data.to_type.is_signed() ? "" : "un";
|
||||
dbgln("KUBSAN: implicit conversion from type {} ({}-bit, {}signed) to type {} ({}-bit, {}signed)",
|
||||
data.from_type.name(), data.from_type.bit_width(), src_signed, data.to_type.name(), data.to_type.bit_width(), dst_signed);
|
||||
critical_dmesgln("KUBSAN: implicit conversion from type {} ({}-bit, {}signed) to type {} ({}-bit, {}signed)", data.from_type.name(), data.from_type.bit_width(), src_signed, data.to_type.name(), data.to_type.bit_width(), dst_signed);
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_invalid_builtin(const InvalidBuiltinData) __attribute__((used));
|
||||
void __ubsan_handle_invalid_builtin(const InvalidBuiltinData data)
|
||||
{
|
||||
dbgln("KUBSAN: passing invalid argument");
|
||||
critical_dmesgln("KUBSAN: passing invalid argument");
|
||||
print_location(data.location);
|
||||
}
|
||||
|
||||
void __ubsan_handle_pointer_overflow(const PointerOverflowData&, ValueHandle, ValueHandle) __attribute__((used));
|
||||
void __ubsan_handle_pointer_overflow(const PointerOverflowData& data, ValueHandle base, ValueHandle result)
|
||||
{
|
||||
if (base == 0 && result == 0) {
|
||||
dbgln("KUBSAN: applied zero offset to nullptr");
|
||||
} else if (base == 0 && result != 0) {
|
||||
dbgln("KUBSAN: applied non-zero offset {:p} to nullptr", result);
|
||||
} else if (base != 0 && result == 0) {
|
||||
dbgln("KUBSAN: applying non-zero offset to non-null pointer {:p} produced null pointer", base);
|
||||
} else {
|
||||
dbgln("KUBSAN: addition of unsigned offset to {:p} overflowed to {:p}", base, result);
|
||||
}
|
||||
if (base == 0 && result == 0)
|
||||
critical_dmesgln("KUBSAN: applied zero offset to nullptr");
|
||||
else if (base == 0 && result != 0)
|
||||
critical_dmesgln("KUBSAN: applied non-zero offset {:p} to nullptr", result);
|
||||
else if (base != 0 && result == 0)
|
||||
critical_dmesgln("KUBSAN: applying non-zero offset to non-null pointer {:p} produced null pointer", base);
|
||||
else
|
||||
critical_dmesgln("KUBSAN: addition of unsigned offset to {:p} overflowed to {:p}", base, result);
|
||||
print_location(data.location);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue