summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorMateusz Guzik <mguzik@redhat.com>2016-08-23 16:20:39 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-09-24 10:09:28 +0200
commit7bac8850af69c9322a9ee32a6cc449d02eccb01f (patch)
treec01ea04ed0dffd01b5f463167fd5d7c562e23882 /kernel
parent2daa86f541b8fa873c56b3cc2c8dc32e03b864fc (diff)
downloadlinux-stable-7bac8850af69c9322a9ee32a6cc449d02eccb01f.tar.gz
linux-stable-7bac8850af69c9322a9ee32a6cc449d02eccb01f.tar.bz2
linux-stable-7bac8850af69c9322a9ee32a6cc449d02eccb01f.zip
audit: fix exe_file access in audit_exe_compare
commit 5efc244346f9f338765da3d592f7947b0afdc4b5 upstream. Prior to the change the function would blindly deference mm, exe_file and exe_file->f_inode, each of which could have been NULL or freed. Use get_task_exe_file to safely obtain stable exe_file. Signed-off-by: Mateusz Guzik <mguzik@redhat.com> Acked-by: Konstantin Khlebnikov <khlebnikov@yandex-team.ru> Acked-by: Richard Guy Briggs <rgb@redhat.com> Signed-off-by: Paul Moore <paul@paul-moore.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/audit_watch.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/kernel/audit_watch.c b/kernel/audit_watch.c
index d6709eb70970..0d302a87f21b 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);
}