diff options
Diffstat (limited to 'kernel/security/selinux')
| -rw-r--r-- | kernel/security/selinux/hooks.c | 3 | ||||
| -rw-r--r-- | kernel/security/selinux/ss/ebitmap.c | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/kernel/security/selinux/hooks.c b/kernel/security/selinux/hooks.c index 212070e1d..7f8d7f19e 100644 --- a/kernel/security/selinux/hooks.c +++ b/kernel/security/selinux/hooks.c @@ -3288,7 +3288,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/kernel/security/selinux/ss/ebitmap.c b/kernel/security/selinux/ss/ebitmap.c index afe6a269e..57644b1dc 100644 --- a/kernel/security/selinux/ss/ebitmap.c +++ b/kernel/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; |