diff options
| author | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 18:02:55 -0800 |
|---|---|---|
| committer | Dmitry Shmidt <dimitrysh@google.com> | 2017-02-15 18:02:55 -0800 |
| commit | 232c28fe23b88e7027c6a20965d6e78421a40532 (patch) | |
| tree | 5aa60cbba4879c913ddd8ee7a7d835c56e53ed8e /fs/exec.c | |
| parent | 54640cfe47251cd8acd7145ff86bcaf4db0e9616 (diff) | |
| parent | 56026a89e632af0cf45602dee1b2881bf21c4eba (diff) | |
Merge remote-tracking branch 'common/android-4.4' into android-4.4.y
Change-Id: Icf907f5067fb6da5935ab0d3271df54b8d5df405
Diffstat (limited to 'fs/exec.c')
| -rw-r--r-- | fs/exec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/exec.c b/fs/exec.c index 3a6de10d3891..b1f5ddbf7d56 100644 --- a/fs/exec.c +++ b/fs/exec.c @@ -1132,8 +1132,10 @@ EXPORT_SYMBOL(flush_old_exec); void would_dump(struct linux_binprm *bprm, struct file *file) { struct inode *inode = file_inode(file); - if (inode_permission(inode, MAY_READ) < 0) { + + if (inode_permission2(file->f_path.mnt, inode, MAY_READ) < 0) { struct user_namespace *old, *user_ns; + bprm->interp_flags |= BINPRM_FLAGS_ENFORCE_NONDUMP; /* Ensure mm->user_ns contains the executable */ |