diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-01 15:55:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-01 15:55:56 -0700 |
| commit | 511a8cdb650544b7efd1bbccf7967d3153aee5f6 (patch) | |
| tree | 9e97e173ca7fb552e4994dd527dcff396acfdcfb /kernel/audit_watch.c | |
| parent | 7d1ce606a37922879cbe40a6122047827105a332 (diff) | |
| parent | 5efc244346f9f338765da3d592f7947b0afdc4b5 (diff) | |
| download | op-kernel-dev-511a8cdb650544b7efd1bbccf7967d3153aee5f6.zip op-kernel-dev-511a8cdb650544b7efd1bbccf7967d3153aee5f6.tar.gz | |
Merge branch 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit
Pull audit fixes from Paul Moore:
"Two small patches to fix some bugs with the audit-by-executable
functionality we introduced back in v4.3 (both patches are marked
for the stable folks)"
* 'stable-4.8' of git://git.infradead.org/users/pcmoore/audit:
audit: fix exe_file access in audit_exe_compare
mm: introduce get_task_exe_file
Diffstat (limited to 'kernel/audit_watch.c')
| -rw-r--r-- | kernel/audit_watch.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c index d6709eb..0d302a8 100644 --- a/kernel/audit_watch.c +++ b/kernel/audit_watch.c @@ -19,6 +19,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include <linux/file.h> #include <linux/kernel.h> #include <linux/audit.h> #include <linux/kthread.h> @@ -544,10 +545,11 @@ int audit_exe_compare(struct task_struct *tsk, struct audit_fsnotify_mark *mark) unsigned long ino; dev_t dev; - rcu_read_lock(); - exe_file = rcu_dereference(tsk->mm->exe_file); + exe_file = get_task_exe_file(tsk); + if (!exe_file) + return 0; ino = exe_file->f_inode->i_ino; dev = exe_file->f_inode->i_sb->s_dev; - rcu_read_unlock(); + fput(exe_file); return audit_mark_compare(mark, ino, dev); } |
