On Wed, Sep 18, 2013 at 01:48:17PM +0400, Konstantin Khlebnikov wrote: > After commit 829199197a430dade2519d54f5545c4a094393b8 audit emiters 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 minimal patch for that bug.
Thanks Konstantin, This patch is in my patchset... > Signed-off-by: Konstantin Khlebnikov <[email protected]> > Cc: Andrew Morton <[email protected]> > Cc: Luiz Capitulino <[email protected]> > Cc: Richard Guy Briggs <[email protected]> > Cc: Eric Paris <[email protected]> > Cc: Chuck Anderson <[email protected]> > Cc: Dan Duval <[email protected]> > Cc: Dave Kleikamp <[email protected]> > --- > kernel/audit.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/kernel/audit.c b/kernel/audit.c > index 91e53d0..7b0e23a 100644 > --- a/kernel/audit.c > +++ b/kernel/audit.c > @@ -1117,9 +1117,10 @@ struct audit_buffer *audit_log_start(struct > audit_context *ctx, gfp_t gfp_mask, > > 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 > - RGB -- Richard Guy Briggs <[email protected]> Senior Software Engineer Kernel Security AMER ENG Base Operating Systems Remote, Ottawa, Canada Voice: +1.647.777.2635 Internal: (81) 32635 Alt: +1.613.693.0684x3545 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
