diff options
| author | Takashi Iwai <tiwai@suse.de> | 2015-09-24 14:02:48 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2015-09-24 14:02:48 +0200 |
| commit | db25f440f42eca380fcdb339f51cf73633e32485 (patch) | |
| tree | d67c8ec502c2ce8b1382538545ee1b8a439dc6e2 /kernel/sys.c | |
| parent | 145d92e77e6f34f53773fdb06789816ec2b6c7b3 (diff) | |
| parent | 83510441bc08bee201c0ded9d81da6dfd008d69a (diff) | |
Merge branch 'for-linus' into for-next
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 259fda25eb6b..fa2f2f671a5c 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1668,8 +1668,7 @@ static int prctl_set_mm_exe_file(struct mm_struct *mm, unsigned int fd) * overall picture. */ err = -EACCES; - if (!S_ISREG(inode->i_mode) || - exe.file->f_path.mnt->mnt_flags & MNT_NOEXEC) + if (!S_ISREG(inode->i_mode) || path_noexec(&exe.file->f_path)) goto exit; err = inode_permission(inode, MAY_EXEC); |