diff options
| author | James Morris <james.l.morris@oracle.com> | 2015-07-11 09:13:45 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2015-07-11 09:13:45 +1000 |
| commit | 3dbbbe0eb6e949409d215f660cfad782aa541a4b (patch) | |
| tree | 455a263e0155b7096cc5766a86c71fbc9879e08a /security | |
| parent | 1604f8719a2dba692c12d333104fcc92613003af (diff) | |
| parent | 892e8cac99a71f6254f84fc662068d912e1943bf (diff) | |
| download | op-kernel-dev-3dbbbe0eb6e949409d215f660cfad782aa541a4b.zip op-kernel-dev-3dbbbe0eb6e949409d215f660cfad782aa541a4b.tar.gz | |
Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/hooks.c | 3 | ||||
| -rw-r--r-- | security/selinux/ss/ebitmap.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c index 6231081..564079c 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 int rc = 0; if (default_noexec && - (prot & PROT_EXEC) && (!file || (!shared && (prot & PROT_WRITE)))) { + (prot & PROT_EXEC) && (!file || IS_PRIVATE(file_inode(file)) || + (!shared && (prot & PROT_WRITE)))) { /* * We are making executable an anonymous mapping or a * private file mapping that will also be writable. diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c index afe6a26..57644b1 100644 --- a/security/selinux/ss/ebitmap.c +++ b/security/selinux/ss/ebitmap.c @@ -153,6 +153,12 @@ int ebitmap_netlbl_import(struct ebitmap *ebmap, if (offset == (u32)-1) return 0; + /* don't waste ebitmap space if the netlabel bitmap is empty */ + if (bitmap == 0) { + offset += EBITMAP_UNIT_SIZE; + continue; + } + if (e_iter == NULL || offset >= e_iter->startbit + EBITMAP_SIZE) { e_prev = e_iter; |
