Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1468053

[PATCH 2/2] audit: fix exe_file access in audit_exe_compare

Show all headers | View raw

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>
---
 kernel/audit_watch.c | 8 +++++---
 1 file 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);
 }
-- 
1.8.3.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/2] introduce get_task_exe_file and use it to fix audit_exe_compare Mateusz Guzik <mguzik@redhat.com> - 2016-08-22 23:00 +0200
  [PATCH 1/2] mm: introduce get_task_exe_file Mateusz Guzik <mguzik@redhat.com> - 2016-08-22 23:00 +0200
  [PATCH 2/2] audit: fix exe_file access in audit_exe_compare Mateusz Guzik <mguzik@redhat.com> - 2016-08-22 23:00 +0200
  Re: [PATCH 0/2] introduce get_task_exe_file and use it to fix  audit_exe_compare Konstantin Khlebnikov <khlebnikov@yandex-team.ru> - 2016-08-23 10:50 +0200

csiph-web