Subject: [merged] audit-fix-endless-wait-in-audit_log_start.patch removed from -mm tree
To: khlebnikov@xxxxxxxxxx,chuck.anderson@xxxxxxxxxx,dan.duval@xxxxxxxxxx,dave.kleikamp@xxxxxxxxxx,eparis@xxxxxxxxxx,lcapitulino@xxxxxxxxxx,rgb@xxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Wed, 25 Sep 2013 12:06:12 -0700
The patch titled
Subject: audit: fix endless wait in audit_log_start()
has been removed from the -mm tree. Its filename was
audit-fix-endless-wait-in-audit_log_start.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxx>
Subject: audit: fix endless wait in audit_log_start()
After 829199197a43 ("kernel/audit.c: avoid negative sleep durations")
audit emitters will block forever if userspace daemon cannot handle
backlog. After the timeout waiting loop turns into busy loop and runs
until daemon dies or returns back to work. This is a minimal patch for
that bug.
Signed-off-by: Konstantin Khlebnikov <khlebnikov@xxxxxxxxxx>
Cc: Luiz Capitulino <lcapitulino@xxxxxxxxxx>
Cc: Richard Guy Briggs <rgb@xxxxxxxxxx>
Cc: Eric Paris <eparis@xxxxxxxxxx>
Cc: Chuck Anderson <chuck.anderson@xxxxxxxxxx>
Cc: Dan Duval <dan.duval@xxxxxxxxxx>
Cc: Dave Kleikamp <dave.kleikamp@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
kernel/audit.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff -puN kernel/audit.c~audit-fix-endless-wait-in-audit_log_start kernel/audit.c
--- a/kernel/audit.c~audit-fix-endless-wait-in-audit_log_start
+++ a/kernel/audit.c
@@ -1117,9 +1117,10 @@ struct audit_buffer *audit_log_start(str
sleep_time = timeout_start + audit_backlog_wait_time -
jiffies;
- if ((long)sleep_time > 0)
+ if ((long)sleep_time > 0) {
wait_for_auditd(sleep_time);
- continue;
+ continue;
+ }
}
if (audit_rate_check() && printk_ratelimit())
printk(KERN_WARNING
_
Patches currently in -mm which might be from khlebnikov@xxxxxxxxxx are
origin.patch
drm-fb-helper-dont-sleep-for-screen-unblank-when-an-oopps-is-in-progress.patch
swap-add-a-simple-detector-for-inappropriate-swapin-readahead.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
