From a9140c0834eacdc16f3f15f0fa8199c2769fdf1e Mon Sep 17 00:00:00 2001
From: Cui GaoSheng <cuigaosheng1@huawei.com>
Date: Thu, 17 Mar 2022 20:40:45 +0800
Subject: [PATCH] Revert "audit: bugfix for infinite loop when flush the hold
queue"
hulk inclusion
category: bugfix
bugzilla: 186384 https://gitee.com/openeuler/kernel/issues/I4X1AI?from=project-issue
CVE: NA
--------------------------------
This reverts commit 67ab712f2b0e7448052f3b8fdee727fb7e204448.
Signed-off-by: Cui GaoSheng <cuigaosheng1@huawei.com>
Reviewed-by: Xiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: Laibin Qiu <qiulaibin@huawei.com>
---
kernel/audit.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/kernel/audit.c b/kernel/audit.c
index 3de5ebb94559..c5e034fe14bb 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -740,8 +740,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid,
if (!sk) {
if (err_hook)
(*err_hook)(skb);
- if (queue == &audit_hold_queue)
- goto out;
continue;
}
@@ -758,8 +756,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid,
(*err_hook)(skb);
if (rc == -EAGAIN)
rc = 0;
- if (queue == &audit_hold_queue)
- goto out;
/* continue to drain the queue */
continue;
} else
@@ -771,7 +767,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid,
}
}
-out:
return (rc >= 0 ? 0 : rc);
}
--
GitLab