Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce UBSAN_ALWAYS_FATAL in micro-UBSan 

UBSAN_ALWAYS_FATAL is a CPP option to mark all reports fatal always.
This commit is contained in:
kamil 2019-06-17 18:55:37 +00:00
parent e39f72b662
commit f8310280bd
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/lib/libc/misc/ubsan.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ubsan.c,v 1.5 2019/02/13 17:17:02 kamil Exp $ */ /* $NetBSD: ubsan.c,v 1.6 2019/06/17 18:55:37 kamil Exp $ */
/*- /*-
* Copyright (c) 2018 The NetBSD Foundation, Inc. * Copyright (c) 2018 The NetBSD Foundation, Inc.
@ -38,9 +38,9 @@
#include <sys/cdefs.h> #include <sys/cdefs.h>
#if defined(_KERNEL) #if defined(_KERNEL)
__KERNEL_RCSID(0, "$NetBSD: ubsan.c,v 1.5 2019/02/13 17:17:02 kamil Exp $"); __KERNEL_RCSID(0, "$NetBSD: ubsan.c,v 1.6 2019/06/17 18:55:37 kamil Exp $");
#else #else
__RCSID("$NetBSD: ubsan.c,v 1.5 2019/02/13 17:17:02 kamil Exp $"); __RCSID("$NetBSD: ubsan.c,v 1.6 2019/06/17 18:55:37 kamil Exp $");
#endif #endif
#if defined(_KERNEL) #if defined(_KERNEL)
@ -79,6 +79,12 @@ __RCSID("$NetBSD: ubsan.c,v 1.5 2019/02/13 17:17:02 kamil Exp $");
#define CLR(t, f) ((t) &= ~(f)) #define CLR(t, f) ((t) &= ~(f))
#endif #endif
#ifdef UBSAN_ALWAYS_FATAL
static const bool alwaysFatal = true;
#else
static const bool alwaysFatal = false;
#endif
#define REINTERPRET_CAST(__dt, __st) ((__dt)(__st)) #define REINTERPRET_CAST(__dt, __st) ((__dt)(__st))
#define STATIC_CAST(__dt, __st) ((__dt)(__st)) #define STATIC_CAST(__dt, __st) ((__dt)(__st))
@ -1122,7 +1128,7 @@ Report(bool isFatal, const char *pFormat, ...)
va_start(ap, pFormat); va_start(ap, pFormat);
#if defined(_KERNEL) #if defined(_KERNEL)
if (isFatal) if (isFatal || alwaysFatal)
vpanic(pFormat, ap); vpanic(pFormat, ap);
else else
vprintf(pFormat, ap); vprintf(pFormat, ap);
@ -1190,7 +1196,7 @@ Report(bool isFatal, const char *pFormat, ...)
ubsan_vsyslog(LOG_DEBUG | LOG_USER, &SyslogData, pFormat, tmp); ubsan_vsyslog(LOG_DEBUG | LOG_USER, &SyslogData, pFormat, tmp);
va_end(tmp); va_end(tmp);
} }
if (isFatal || ISSET(ubsan_flags, UBSAN_ABORT)) { if (isFatal || alwaysFatal || ISSET(ubsan_flags, UBSAN_ABORT)) {
abort(); abort();
__unreachable(); __unreachable();
/* NOTREACHED */ /* NOTREACHED */