aboutsummaryrefslogtreecommitdiffstats
path: root/fs/exec.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-06 03:04:32 -0500
committerIngo Molnar <mingo@elte.hu>2009-01-06 03:04:32 -0500
commitd12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch)
treeac94d5bf58360b89fc7439fb52182c17d0674b0a /fs/exec.c
parentc2d1cec1c77f7714672c1efeae075424c929e0d5 (diff)
parent238c6d54830c624f34ac9cf123ac04aebfca5013 (diff)
Merge branch 'linus' into cpus4096
Diffstat (limited to 'fs/exec.c')
-rw-r--r--fs/exec.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 3ef9cf9b1871..9c33f542dc77 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -51,6 +51,7 @@
51#include <linux/audit.h> 51#include <linux/audit.h>
52#include <linux/tracehook.h> 52#include <linux/tracehook.h>
53#include <linux/kmod.h> 53#include <linux/kmod.h>
54#include <linux/fsnotify.h>
54 55
55#include <asm/uaccess.h> 56#include <asm/uaccess.h>
56#include <asm/mmu_context.h> 57#include <asm/mmu_context.h>
@@ -132,6 +133,8 @@ asmlinkage long sys_uselib(const char __user * library)
132 if (IS_ERR(file)) 133 if (IS_ERR(file))
133 goto out; 134 goto out;
134 135
136 fsnotify_open(file->f_path.dentry);
137
135 error = -ENOEXEC; 138 error = -ENOEXEC;
136 if(file->f_op) { 139 if(file->f_op) {
137 struct linux_binfmt * fmt; 140 struct linux_binfmt * fmt;
@@ -684,6 +687,8 @@ struct file *open_exec(const char *name)
684 if (IS_ERR(file)) 687 if (IS_ERR(file))
685 return file; 688 return file;
686 689
690 fsnotify_open(file->f_path.dentry);
691
687 err = deny_write_access(file); 692 err = deny_write_access(file);
688 if (err) { 693 if (err) {
689 fput(file); 694 fput(file);