提交 a9140c08 编写于 作者: C Cui GaoSheng 提交者: Laibin Qiu

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 67ab712f.
Signed-off-by: NCui GaoSheng <cuigaosheng1@huawei.com>
Reviewed-by: NXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: NLaibin Qiu <qiulaibin@huawei.com>
上级 2632c58b
...@@ -740,8 +740,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, ...@@ -740,8 +740,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid,
if (!sk) { if (!sk) {
if (err_hook) if (err_hook)
(*err_hook)(skb); (*err_hook)(skb);
if (queue == &audit_hold_queue)
goto out;
continue; continue;
} }
...@@ -758,8 +756,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, ...@@ -758,8 +756,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid,
(*err_hook)(skb); (*err_hook)(skb);
if (rc == -EAGAIN) if (rc == -EAGAIN)
rc = 0; rc = 0;
if (queue == &audit_hold_queue)
goto out;
/* continue to drain the queue */ /* continue to drain the queue */
continue; continue;
} else } else
...@@ -771,7 +767,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, ...@@ -771,7 +767,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid,
} }
} }
out:
return (rc >= 0 ? 0 : rc); return (rc >= 0 ? 0 : rc);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册