aboutsummaryrefslogtreecommitdiffstats
path: root/fs/binfmt_misc.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2011-06-19 12:49:47 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2011-07-20 01:43:10 -0400
commit1b5d783c94c328d406e801566f161adcfb018dda (patch)
treee7d27b987e0670099af28db0d6bfcdac33236046 /fs/binfmt_misc.c
parent78f32a9b479e9b9f1ce2bf620a7602c1cdbc4c8e (diff)
consolidate BINPRM_FLAGS_ENFORCE_NONDUMP handling
new helper: would_dump(bprm, file). Checks if we are allowed to read the file and if we are not - sets ENFORCE_NODUMP. Exported, used in places that previously open-coded the same logics. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/binfmt_misc.c')
-rw-r--r--fs/binfmt_misc.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/fs/binfmt_misc.c b/fs/binfmt_misc.c
index 1befe2ec8186..ba1a1ae4a18a 100644
--- a/fs/binfmt_misc.c
+++ b/fs/binfmt_misc.c
@@ -149,8 +149,7 @@ static int load_misc_binary(struct linux_binprm *bprm, struct pt_regs *regs)
149 149
150 /* if the binary is not readable than enforce mm->dumpable=0 150 /* if the binary is not readable than enforce mm->dumpable=0
151 regardless of the interpreter's permissions */ 151 regardless of the interpreter's permissions */
152 if (file_permission(bprm->file, MAY_READ)) 152 would_dump(bprm, bprm->file);
153 bprm->interp_flags |= BINPRM_FLAGS_ENFORCE_NONDUMP;
154 153
155 allow_write_access(bprm->file); 154 allow_write_access(bprm->file);
156 bprm->file = NULL; 155 bprm->file = NULL;