Pull align-sig-frame into release branch

[linux-2.6] / fs / binfmt_misc.c

diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 8ae0db6cd69c5772daa86e0dd36aa3df1d3c2333..2568eb41cb3a248fece5a8b498924a3dc6defe43 100644 (file)
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -150,7 +150,7 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 
                /* if the binary is not readable than enforce mm->dumpable=0
                   regardless of the interpreter's permissions */
-               if (permission(bprm->file->f_dentry->d_inode, MAY_READ, NULL))
+               if (file_permission(bprm->file, MAY_READ))
                        bprm->interp_flags |= BINPRM_FLAGS_ENFORCE_NONDUMP;
 
                allow_write_access(bprm->file);