diff options
| author | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-03-23 19:52:46 -0400 |
| commit | 703a3cd72817e99201cef84a8a7aecc60b2b3581 (patch) | |
| tree | 3e943755178ff410694722bb031f523136fbc432 /fs/compat.c | |
| parent | df7f54c012b92ec93d56b68547351dcdf8a163d3 (diff) | |
| parent | 8e0ee43bc2c3e19db56a4adaa9a9b04ce885cd84 (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'fs/compat.c')
| -rw-r--r-- | fs/compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/compat.c b/fs/compat.c index 25589f8322f2..0949b43794a4 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
| @@ -1408,7 +1408,7 @@ int compat_do_execve(char * filename, | |||
| 1408 | bprm->cred = prepare_exec_creds(); | 1408 | bprm->cred = prepare_exec_creds(); |
| 1409 | if (!bprm->cred) | 1409 | if (!bprm->cred) |
| 1410 | goto out_unlock; | 1410 | goto out_unlock; |
| 1411 | check_unsafe_exec(bprm); | 1411 | check_unsafe_exec(bprm, current->files); |
| 1412 | 1412 | ||
| 1413 | file = open_exec(filename); | 1413 | file = open_exec(filename); |
| 1414 | retval = PTR_ERR(file); | 1414 | retval = PTR_ERR(file); |