Skip to content
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

fix: usec: disp-af_unix无法接收到AUDIT_EOE消息 #7

Merged
merged 1 commit into from
Sep 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debian/changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
audit (1:3.1.2-2deepin3) unstable; urgency=medium

* fix: disp-af_unix无法接收到AUDIT_EOE消息

-- zhangya <[email protected]> Wed, 11 Sep 2024 19:24:03 +0800

audit (1:3.1.2-2deepin2) unstable; urgency=medium

* add DAC_add_nametype.patch
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
From bc051447716c4141e9b951c55cba4c6fba921092 Mon Sep 17 00:00:00 2001
From: zhangya <[email protected]>
Date: Wed, 11 Sep 2024 19:19:27 +0800
Subject: [PATCH] audisp-af_unix无法接收到AUDIT_EOE消息

---
auparse/auparse.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/auparse/auparse.c b/auparse/auparse.c
index 6f3fb94..9d83879 100644
--- a/auparse/auparse.c
+++ b/auparse/auparse.c
@@ -1636,13 +1636,14 @@ static int au_auparse_next_event(auparse_state_t *au)
free(l);
continue;
}
- // Eat standalone EOE - main event was already marked complete
- if (l->head->type == AUDIT_EOE) {
- au->cur_buf = NULL;
- aup_list_clear(l);
- free(l);
- continue;
- }
+ // 如果吃掉,audisp讲无法接收到AUDIT_EOE消息,这会导致消息处理有问题https://lists.linux-audit.osci.io/archives/list/[email protected]/thread/M24F7DOPPJKSVR4MVO34P2PP2HA5O5TZ/?sort=thread
+ // // Eat standalone EOE - main event was already marked complete
+ // if (l->head->type == AUDIT_EOE) {
+ // au->cur_buf = NULL;
+ // aup_list_clear(l);
+ // free(l);
+ // continue;
+ // }
if (au_lol_append(au->au_lo, l) == NULL) {
free((char *)e.host);
#ifdef LOL_EVENTS_DEBUG01
--
2.20.1

1 change: 1 addition & 0 deletions debian/patches/series
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
03-Set-log_group-adm.patch
usec-audit-mac-patches.patch
DAC_add_nametype.patch
005-uniontech-fix-audisp-af_unix-no-reveive-AUDIT_EOE.patch
Loading