Merge branch 'stable-4.9' of git://git.infradead.org/users/pcmoore/audit

Pull audit updates from Paul Moore:
 "Another relatively small pull request for v4.9 with just two patches.

  The patch from Richard updates the list of features we support and
  report back to userspace; this should have been sent earlier with the
  rest of the v4.8 patches but it got lost in my inbox.

  The second patch fixes a problem reported by our Android friends where
  we weren't very consistent in recording PIDs"

* 'stable-4.9' of git://git.infradead.org/users/pcmoore/audit:
  audit: add exclude filter extension to feature bitmap
  audit: consistently record PIDs with task_tgid_nr()

1 files changed, 2 insertions, 2 deletions

diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index cccbf3068cdc..45d927ab807d 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -220,7 +220,7 @@ static void dump_common_audit_data(struct audit_buffer *ab,
          */
         BUILD_BUG_ON(sizeof(a->u) > sizeof(void *)*2);
 
-        audit_log_format(ab, " pid=%d comm=", task_pid_nr(current));
+        audit_log_format(ab, " pid=%d comm=", task_tgid_nr(current));
         audit_log_untrustedstring(ab, memcpy(comm, current->comm, sizeof(comm)));
 
         switch (a->type) {
@@ -294,7 +294,7 @@ static void dump_common_audit_data(struct audit_buffer *ab,
         case LSM_AUDIT_DATA_TASK: {
                 struct task_struct *tsk = a->u.tsk;
                 if (tsk) {
-                        pid_t pid = task_pid_nr(tsk);
+                        pid_t pid = task_tgid_nr(tsk);
                         if (pid) {
                                 char comm[sizeof(tsk->comm)];
                                 audit_log_format(ab, " opid=%d ocomm=", pid);