VisionFive2 Linux kernel

author: Al Viro <viro@zeniv.linux.org.uk> 2011-06-19 12:49:47 -0400 committer: Al Viro <viro@zeniv.linux.org.uk> 2011-07-20 01:43:10 -0400 commit: 1b5d783c94c328d406e801566f161adcfb018dda parent: 78f32a9b479e9b9f1ce2bf620a7602c1cdbc4c8e

Commit Summary:

consolidate BINPRM_FLAGS_ENFORCE_NONDUMP handling

Diffstat:

1 file changed, 1 insertion, 2 deletions

diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
index 2bc5dc644b4c..30745f459faf 100644
--- a/fs/binfmt_elf_fdpic.c
+++ b/fs/binfmt_elf_fdpic.c
@@ -245,8 +245,7 @@ static int load_elf_fdpic_binary(struct linux_binprm *bprm,
 			 * mm->dumpable = 0 regardless of the interpreter's
 			 * permissions.
 			 */
-			if (file_permission(interpreter, MAY_READ) < 0)
-				bprm->interp_flags |= BINPRM_FLAGS_ENFORCE_NONDUMP;
+			would_dump(bprm, interpreter);
 
 			retval = kernel_read(interpreter, 0, bprm->buf,
 					     BINPRM_BUF_SIZE);