-
Notifications
You must be signed in to change notification settings - Fork 15.1k
[libc++][hardening] Introduce a dylib function to log hardening errors. #148266
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
var-const
merged 13 commits into
llvm:main
from
var-const:varconst/hardening-semantics-log_fatal_error
Jul 15, 2025
Merged
Changes from 11 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
1fcfec3
[libc++][hardening] Introduce a dylib function to log hardening errors.
var-const ef34ade
Address feedback
var-const 01eb85d
Update the ABI list plus minor tweaks.
var-const cfbf82e
Regenerate the symbol list for Linux.
var-const 1e38d40
Always log to `stderr` before making any system calls (which might not
var-const 78ff152
More symbol list updates.
var-const 0da96f3
More symbol list updates.
var-const c930bbf
More symbol list updates.
var-const 03da891
Even more updates to the symbol list.
var-const 2882400
Address feedback
var-const 9c29b62
Don't call `os_fault` if running on a simulator.
var-const 9589441
Address feedback
var-const a98b05a
Fix the CI
var-const File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
// -*- C++ -*- | ||
//===----------------------------------------------------------------------===// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
#ifndef _LIBCPP___LOG_ERROR | ||
#define _LIBCPP___LOG_ERROR | ||
|
||
#include <__config> | ||
|
||
#if !defined(_LIBCPP_HAS_NO_PRAGMA_SYSTEM_HEADER) | ||
# pragma GCC system_header | ||
#endif | ||
|
||
_LIBCPP_BEGIN_NAMESPACE_STD | ||
|
||
enum class __log_error_reason : int { | ||
// Where possible, it logs in a way that indicates a fatal error (which might include capturing the stack trace). | ||
__hardening_failure | ||
}; | ||
|
||
// This function should never be called directly from the code -- it should only be called through the | ||
// `_LIBCPP_LOG_ERROR` macro. | ||
_LIBCPP_AVAILABILITY_LOG_ERROR _LIBCPP_EXPORTED_FROM_ABI void | ||
__log_error(__log_error_reason __reason, const char* __message) _NOEXCEPT; | ||
|
||
// _LIBCPP_LOG_ERROR(message) | ||
// | ||
// This macro is used to log an error without terminating the program (as is the case for hardening failures if the | ||
// `observe` assertion semantic is used, for example). | ||
|
||
#if !defined(_LIBCPP_LOG_ERROR) | ||
ldionne marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
|
||
# if !_LIBCPP_AVAILABILITY_HAS_LOG_ERROR | ||
// The decltype is there to suppress -Wunused warnings in this configuration. | ||
void __use(const char*); | ||
# define _LIBCPP_LOG_ERROR(__message) (decltype(::std::__use(__message))()) | ||
var-const marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
# else | ||
# define _LIBCPP_LOG_ERROR(__reason, __message) ::std::__log_error(__reason, __message) | ||
# endif | ||
|
||
#endif // !defined(_LIBCPP_LOG_ERROR) | ||
|
||
_LIBCPP_END_NAMESPACE_STD | ||
|
||
#endif // _LIBCPP___LOG_ERROR |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could we move all these functions into a single header like
__hardening_utils
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we keep the current approach where the logging function is more generic and not exclusively for hardening, then IMO it shouldn't be in
__hardening_utils
; although perhaps something more generic like__error_handling_utils
might make sense -- WDYT?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sounds good to me as well. The main thing I'd like to avoid is having a bunch of tiny headers for very closely related utilities.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
FWIW, Costa and I discussed this previously and we were thinking to reorganize the top-level headers like
__verbose_abort
,__assert
& friends in a follow-up patch where we'll have an overall view.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Will do in an immediate follow-up patch.