packages/aide
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!66 [sync] PR-64: 【openEuler-22.03-LTS-SP4】Use signal safe write function in signal handler

Browse Source 
From: @openeuler-sync-bot 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2025-01-10 09:36:05 +00:00 committed by Gitee
commit 0178393199
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
aide.spec
View File

@ -2,7 +2,7 @@
Name: aide Name: aide
Version: 0.17.4 Version: 0.17.4
Release: 4 Release: 5
Summary: Advanced Intrusion Detection Environment Summary: Advanced Intrusion Detection Environment
License: GPLv2+ License: GPLv2+
URL: http://sourceforge.net/projects/aide URL: http://sourceforge.net/projects/aide
@ -26,6 +26,7 @@ Patch1: backport-Handle-malformed-database-lines.patch
Patch2: backport-Fix-handling-of-duplicate-database-entries.patch Patch2: backport-Fix-handling-of-duplicate-database-entries.patch
Patch3: backport-Switch-from-PCRE-to-PCRE2-closes-116.patch Patch3: backport-Switch-from-PCRE-to-PCRE2-closes-116.patch
Patch4: backport-Fix-condition-for-error-message-of-failing-to-open-g.patch Patch4: backport-Fix-condition-for-error-message-of-failing-to-open-g.patch
Patch5: backport-Use-signal-safe-write-function-in-signal-handler.patch
%description %description
AIDE (Advanced Intrusion Detection Environment, [eyd]) is a file and directory integrity checker. AIDE (Advanced Intrusion Detection Environment, [eyd]) is a file and directory integrity checker.
@ -81,6 +82,12 @@ make check
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* Thu Jan 9 2025 yixiangzhike <yixiangzhike007@163.com> - 0.17.4-5
- Type:bugfix
- ID:NA
- SUG:NA
- DESC: backport upstream patch to use signal safe write function in signal handler
* Thu Jul 4 2024 yixiangzhike <yixiangzhike007@163.com> - 0.17.4-4 * Thu Jul 4 2024 yixiangzhike <yixiangzhike007@163.com> - 0.17.4-4
- Type:bugfix - Type:bugfix
- ID:NA - ID:NA

63
backport-Use-signal-safe-write-function-in-signal-handler.patch Normal file
View File

@ -0,0 +1,63 @@
From f1728dc97c981d76fd913102a822c71c35c58946 Mon Sep 17 00:00:00 2001
From: Hannes von Haugwitz <hannes@vonhaugwitz.com>
Date: Sat, 9 Jul 2022 23:06:36 +0200
Subject: [PATCH] Use signal-safe write function in signal handler
* closes: #100
---
src/aide.c | 20 +++---
1 files changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/aide.c b/src/aide.c
index 30e2942..e935794 100644
--- a/src/aide.c
+++ b/src/aide.c
@@ -103,33 +103,37 @@ static void init_sighandler()
static void sig_handler(int signum)
{
+ char *str;
switch(signum){
case SIGBUS : {
if(conf->catch_mmap==1){
- log_msg(LOG_LEVEL_NOTICE, "Caught SIGBUS while mmapping. File was truncated while aide was running?");
+ str = "Caught SIGBUS while mmapping. File was truncated while aide was running?\n";
+ write(STDERR_FILENO ,str, strlen(str));
conf->catch_mmap=0;
} else {
- log_msg(LOG_LEVEL_ERROR, "Caught SIGBUS. Exiting");
+ str = "Caught SIGBUS. Exiting\n";
+ write(STDERR_FILENO ,str, strlen(str));
exit(EXIT_FAILURE);
}
break;
}
case SIGHUP : {
- log_msg(LOG_LEVEL_INFO, "Caught SIGHUP");
+ str = "Caught SIGHUP. Ignoring\n";
+ write(STDERR_FILENO ,str, strlen(str));
break;
}
case SIGTERM : {
- log_msg(LOG_LEVEL_INFO, "Caught SIGTERM. Use SIGKILL to terminate");
+ str = "Caught SIGTERM. Use SIGKILL to terminate\n";
+ write(STDERR_FILENO ,str, strlen(str));
break;
}
case SIGUSR1 : {
- log_msg(LOG_LEVEL_INFO, "Caught SIGUSR1, toggle debug level: set log level to %s", get_log_level_name(toogle_log_level(LOG_LEVEL_DEBUG)));
+ str = "Caught SIGUSR1, toggle debug level\n";
+ write(STDERR_FILENO ,str, strlen(str));
+ toogle_log_level(LOG_LEVEL_DEBUG);
break;
}
}
- init_sighandler();
-
- return;
}
static void print_version(void)
--
2.33.0