mirror of
https://github.com/systemd/systemd.git
synced 2025-03-19 22:50:17 +03:00
Merge 11b3439fd3dc6a10b9515dc820604543beadebda into 104587314ff25a5c35390eeb42308f083e1e0488
This commit is contained in:
commit
19246b94d9
@ -101,7 +101,7 @@ _noreturn_ static void crash(int sig, siginfo_t *siginfo, void *context) {
|
||||
} else {
|
||||
siginfo_t status;
|
||||
|
||||
if (siginfo) {
|
||||
if (siginfo && IN_SET(siginfo->si_code, SI_USER, SI_QUEUE)) {
|
||||
if (siginfo->si_pid == 0)
|
||||
log_struct(LOG_EMERG,
|
||||
LOG_MESSAGE("Caught <%s>, from unknown sender process.", signal_to_string(sig)),
|
||||
@ -114,7 +114,10 @@ _noreturn_ static void crash(int sig, siginfo_t *siginfo, void *context) {
|
||||
log_struct(LOG_EMERG,
|
||||
LOG_MESSAGE("Caught <%s> from PID "PID_FMT".", signal_to_string(sig), siginfo->si_pid),
|
||||
"MESSAGE_ID=" SD_MESSAGE_CRASH_PROCESS_SIGNAL_STR);
|
||||
}
|
||||
} else
|
||||
log_struct(LOG_EMERG,
|
||||
LOG_MESSAGE("Caught <%s>, from signal code %d.", signal_to_string(sig), siginfo->si_code),
|
||||
"MESSAGE_ID=" SD_MESSAGE_CRASH_PROCESS_SIGNAL_STR);
|
||||
|
||||
/* Order things nicely. */
|
||||
r = wait_for_terminate(pid, &status);
|
||||
|
Loading…
x
Reference in New Issue
Block a user