aboutsummaryrefslogtreecommitdiffstats
path: root/fs/exec.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/exec.c')
-rw-r--r--fs/exec.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 6075a1e727ae..f9f12ad299af 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1105,6 +1105,13 @@ out:
1105} 1105}
1106EXPORT_SYMBOL(flush_old_exec); 1106EXPORT_SYMBOL(flush_old_exec);
1107 1107
1108void would_dump(struct linux_binprm *bprm, struct file *file)
1109{
1110 if (inode_permission(file->f_path.dentry->d_inode, MAY_READ) < 0)
1111 bprm->interp_flags |= BINPRM_FLAGS_ENFORCE_NONDUMP;
1112}
1113EXPORT_SYMBOL(would_dump);
1114
1108void setup_new_exec(struct linux_binprm * bprm) 1115void setup_new_exec(struct linux_binprm * bprm)
1109{ 1116{
1110 int i, ch; 1117 int i, ch;
@@ -1144,9 +1151,10 @@ void setup_new_exec(struct linux_binprm * bprm)
1144 if (bprm->cred->uid != current_euid() || 1151 if (bprm->cred->uid != current_euid() ||
1145 bprm->cred->gid != current_egid()) { 1152 bprm->cred->gid != current_egid()) {
1146 current->pdeath_signal = 0; 1153 current->pdeath_signal = 0;
1147 } else if (file_permission(bprm->file, MAY_READ) || 1154 } else {
1148 bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP) { 1155 would_dump(bprm, bprm->file);
1149 set_dumpable(current->mm, suid_dumpable); 1156 if (bprm->interp_flags & BINPRM_FLAGS_ENFORCE_NONDUMP)
1157 set_dumpable(current->mm, suid_dumpable);
1150 } 1158 }
1151 1159
1152 /* 1160 /*