提交 f1faff34 编写于 作者: C Cui GaoSheng 提交者: Zheng Zengkai

Revert "audit: bugfix for infinite loop when flush the hold queue"

hulk inclusion
category: bugfix
bugzilla: 186383 https://gitee.com/openeuler/kernel/issues/I4X1AI?from=project-issue
CVE: NA
backport: openEuler-22.03-LTS

--------------------------------

This reverts commit fcfdde9c.
Signed-off-by: NCui GaoSheng <cuigaosheng1@huawei.com>
Reviewed-by: NXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 1f4b8388
...@@ -732,8 +732,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, ...@@ -732,8 +732,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;
} }
...@@ -750,8 +748,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, ...@@ -750,8 +748,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
...@@ -763,7 +759,6 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, ...@@ -763,7 +759,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.
先完成此消息的编辑!
想要评论请 注册