Merge branch 'master' into next

This commit is contained in:
James Morris
2009-03-24 10:52:46 +11:00
1409 changed files with 58127 additions and 39827 deletions

View File

@@ -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);