projects
/
linux-flexiantxendom0-natty.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into next
[linux-flexiantxendom0-natty.git]
/
fs
/
compat.c
diff --git
a/fs/compat.c
b/fs/compat.c
index
25589f8
..
0949b43
100644
(file)
--- a/
fs/compat.c
+++ b/
fs/compat.c
@@
-1408,7
+1408,7
@@
int compat_do_execve(char * filename,
bprm->cred = prepare_exec_creds();
if (!bprm->cred)
goto out_unlock;
- check_unsafe_exec(bprm);
+ check_unsafe_exec(bprm, current->files);
file = open_exec(filename);
retval = PTR_ERR(file);