summaryrefslogtreecommitdiff
path: root/kernel/audit.c
diff options
context:
space:
mode:
authorRichard Guy Briggs <rgb@redhat.com>2016-01-13 09:15:19 -0500
committerPaul Moore <paul@paul-moore.com>2016-01-13 09:15:19 -0500
commitf48a942926c58e4b2dfc3f21c58579d5435841ef (patch)
treeb727f5831e233e2f56b5c4cb8b70601542bc8336 /kernel/audit.c
parenteb8baf6aa3ba1fcb1c1fd2cc57e31195a42689fd (diff)
downloadlinux-sh-f48a942926c58e4b2dfc3f21c58579d5435841ef.tar.gz
audit: include auditd's threads in audit_log_start() wait exception
Should auditd spawn threads, allow all members of its thread group to use the audit_backlog_limit reserves to bypass the queue limits too. Signed-off-by: Richard Guy Briggs <rgb@redhat.com> [PM: minor upstream merge tweaks] Signed-off-by: Paul Moore <pmoore@redhat.com>
Diffstat (limited to 'kernel/audit.c')
-rw-r--r--kernel/audit.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/audit.c b/kernel/audit.c
index 07d60e4b2af8..60c9c5adc5be 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -1371,7 +1371,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask,
return NULL;
if (gfp_mask & __GFP_DIRECT_RECLAIM) {
- if (audit_pid && audit_pid == current->pid)
+ if (audit_pid && audit_pid == current->tgid)
gfp_mask &= ~__GFP_DIRECT_RECLAIM;
else
reserve = 0;