Remove unused patch
(cherry picked from commit 5d4c4f5b67d61dd90009fec4328f4bd86bea31be)
This commit is contained in:
parent
7bb4e98453
commit
cbcecf5660
@ -1,67 +0,0 @@
|
||||
From 1af601fed7c23849ae50cacf0eff15fa7dc781a8 Mon Sep 17 00:00:00 2001
|
||||
From: Steve Grubb <sgrubb@redhat.com>
|
||||
Date: Tue, 26 Mar 2019 09:18:00 -0400
|
||||
Subject: [PATCH 1/2] Fix memleak in auparse caused by corrected event ordering
|
||||
|
||||
---
|
||||
auparse/auparse.c | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
|
||||
diff --git a/auparse/auparse.c b/auparse/auparse.c
|
||||
index 042ea2b..af5dc7b 100644
|
||||
--- a/auparse/auparse.c
|
||||
+++ b/auparse/auparse.c
|
||||
@@ -266,6 +266,14 @@ static event_list_t *au_get_ready_event(auparse_state_t *au, int is_test)
|
||||
au_lolnode *ptr = lowest;
|
||||
while (ptr->status == EBS_EMPTY && lol->maxi > 0) {
|
||||
lol->maxi--;
|
||||
+ if (ptr->l) {
|
||||
+ aup_list_clear(ptr->l);
|
||||
+ free(ptr->l);
|
||||
+ ptr->l = NULL;
|
||||
+ au->le = NULL; // this should crash
|
||||
+ // usage of au->le
|
||||
+ // until reset
|
||||
+ }
|
||||
ptr = &lol->array[lol->maxi];
|
||||
}
|
||||
}
|
||||
|
||||
From a4ed2001dd9db902764256ee08bd53e2039f217e Mon Sep 17 00:00:00 2001
|
||||
From: Steve Grubb <sgrubb@redhat.com>
|
||||
Date: Tue, 26 Mar 2019 17:24:37 -0400
|
||||
Subject: [PATCH 2/2] Fix memleak in auparse caused by corrected event ordering
|
||||
part 2
|
||||
|
||||
---
|
||||
auparse/auparse.c | 17 -----------------
|
||||
1 file changed, 17 deletions(-)
|
||||
|
||||
diff --git a/auparse/auparse.c b/auparse/auparse.c
|
||||
index af5dc7b..7662b85 100644
|
||||
--- a/auparse/auparse.c
|
||||
+++ b/auparse/auparse.c
|
||||
@@ -260,23 +260,6 @@ static event_list_t *au_get_ready_event(auparse_state_t *au, int is_test)
|
||||
if (lowest && lowest->status == EBS_COMPLETE) {
|
||||
lowest->status = EBS_EMPTY;
|
||||
au->au_ready--;
|
||||
- // Try to consolidate the array so that we iterate
|
||||
- // over a smaller portion next time
|
||||
- if (lowest == &lol->array[lol->maxi]) {
|
||||
- au_lolnode *ptr = lowest;
|
||||
- while (ptr->status == EBS_EMPTY && lol->maxi > 0) {
|
||||
- lol->maxi--;
|
||||
- if (ptr->l) {
|
||||
- aup_list_clear(ptr->l);
|
||||
- free(ptr->l);
|
||||
- ptr->l = NULL;
|
||||
- au->le = NULL; // this should crash
|
||||
- // usage of au->le
|
||||
- // until reset
|
||||
- }
|
||||
- ptr = &lol->array[lol->maxi];
|
||||
- }
|
||||
- }
|
||||
return lowest->l;
|
||||
}
|
||||
|
||||
@ -4,7 +4,7 @@ Summary: User space tools for kernel auditing
|
||||
Name: audit
|
||||
Epoch: 1
|
||||
Version: 3.0
|
||||
Release: 1
|
||||
Release: 2
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: https://people.redhat.com/sgrubb/audit/
|
||||
Source0: https://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
|
||||
@ -360,6 +360,9 @@ fi
|
||||
%attr(644,root,root) %{_mandir}/man8/*.8.gz
|
||||
|
||||
%changelog
|
||||
* Wed May 26 2021 yixiangzhike <zhangxingliang3@huawei.com> - 3.0-2
|
||||
- remove unused patch
|
||||
|
||||
* Tue May 25 2021 yixiangzhike <zhangxingliang3@huawei.com> - 3.0-1
|
||||
- update to 3.0
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user