Merge branch 'master' into next

[linux-2.6-omap-h63xx.git] / fs / compat.c

diff --git a/fs/compat.c b/fs/compat.c
index 25589f8322f280e54c4380e605702d027afe0c85..0949b43794a4896827dd70714d3b3b7b9a0ae6ed 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);