diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-07-28 14:08:28 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-07-28 14:08:28 +1000 |
| commit | 0e4ed9b99488c47a0cd1fd50c689be8c9146157c (patch) | |
| tree | 9e4cdb0938e07bfb67ad7bfc00864cfeb43f08d2 /security | |
| parent | e14b1f487375ecf9a096aadc66bb0c5eb4c165e0 (diff) | |
| parent | 75509fd88fbd580c793780b0001c71c3510f2726 (diff) | |
Merge remote-tracking branch 'userns/for-next'
Diffstat (limited to 'security')
| -rw-r--r-- | security/security.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/security.c b/security/security.c index 595fffab48b0..062f3c997fdc 100644 --- a/security/security.c +++ b/security/security.c @@ -776,7 +776,7 @@ static inline unsigned long mmap_prot(struct file *file, unsigned long prot) * ditto if it's not on noexec mount, except that on !MMU we need * NOMMU_MAP_EXEC (== VM_MAYEXEC) in this case */ - if (!(file->f_path.mnt->mnt_flags & MNT_NOEXEC)) { + if (!path_noexec(&file->f_path)) { #ifndef CONFIG_MMU if (file->f_op->mmap_capabilities) { unsigned caps = file->f_op->mmap_capabilities(file); |