diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2017-04-13 06:59:01 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2017-04-13 06:59:01 +0200 |
| commit | bfca9acf1a5df0ff98fbf47e363adb48612bb7ec (patch) | |
| tree | a50287c88fdc60a73912d205d7bce41b7af53827 /kernel/auditsc.c | |
| parent | device-dax: utilize new cdev_device_add helper function (diff) | |
| parent | x86, pmem: fix broken __copy_user_nocache cache-bypass assumptions (diff) | |
| download | linux-bfca9acf1a5df0ff98fbf47e363adb48612bb7ec.tar.xz linux-bfca9acf1a5df0ff98fbf47e363adb48612bb7ec.zip | |
Merge branch 'for-4.11/libnvdimm' into for-4.12/dax
Diffstat (limited to 'kernel/auditsc.c')
| -rw-r--r-- | kernel/auditsc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index d6a8de5f8fa3..e59ffc7fc522 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -762,7 +762,7 @@ static enum audit_state audit_filter_syscall(struct task_struct *tsk, struct audit_entry *e; enum audit_state state; - if (audit_pid && tsk->tgid == audit_pid) + if (auditd_test_task(tsk)) return AUDIT_DISABLED; rcu_read_lock(); @@ -816,7 +816,7 @@ void audit_filter_inodes(struct task_struct *tsk, struct audit_context *ctx) { struct audit_names *n; - if (audit_pid && tsk->tgid == audit_pid) + if (auditd_test_task(tsk)) return; rcu_read_lock(); @@ -2256,7 +2256,7 @@ int __audit_signal_info(int sig, struct task_struct *t) struct audit_context *ctx = tsk->audit_context; kuid_t uid = current_uid(), t_uid = task_uid(t); - if (audit_pid && t->tgid == audit_pid) { + if (auditd_test_task(t)) { if (sig == SIGTERM || sig == SIGHUP || sig == SIGUSR1 || sig == SIGUSR2) { audit_sig_pid = task_tgid_nr(tsk); if (uid_valid(tsk->loginuid)) |