diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-07-10 19:13:45 -0400 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-07-10 19:13:45 -0400 |
| commit | 3dbbbe0eb6e949409d215f660cfad782aa541a4b (patch) | |
| tree | 455a263e0155b7096cc5766a86c71fbc9879e08a /security/selinux/hooks.c | |
| parent | 1604f8719a2dba692c12d333104fcc92613003af (diff) | |
| parent | 892e8cac99a71f6254f84fc662068d912e1943bf (diff) | |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2
Diffstat (limited to 'security/selinux/hooks.c')
| -rw-r--r-- | security/selinux/hooks.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 623108199641..564079c5c49d 100644 --- a/security/selinux/hooks.c +++ b/security/selinux/hooks.c | |||
| @@ -3283,7 +3283,8 @@ static int file_map_prot_check(struct file *file, unsigned long prot, int shared | |||
| 3283 | int rc = 0; | 3283 | int rc = 0; |
| 3284 | 3284 | ||
| 3285 | if (default_noexec && | 3285 | if (default_noexec && |
| 3286 | (prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) { | 3286 | (prot & PROT_EXEC) && (!file || IS_PRIVATE(file_inode(file)) || |
| 3287 | (!shared && (prot & PROT_WRITE)))) { | ||
| 3287 | /* | 3288 | /* |
| 3288 | * We are making executable an anonymous mapping or a | 3289 | * We are making executable an anonymous mapping or a |
| 3289 | * private file mapping that will also be writable. | 3290 | * private file mapping that will also be writable. |