Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
Pull selinux fixes from James Morris.
* 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
selinux: fix mprotect PROT_EXEC regression caused by mm change
selinux: don't waste ebitmap space when importing NetLabel categories
+8
-1
+2
-1
security/selinux/hooks.c
+2
-1
security/selinux/hooks.c
···
3283
3283
int rc = 0;
3284
3284
3285
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
3289
* We are making executable an anonymous mapping or a
3289
3290
* private file mapping that will also be writable.
+6
security/selinux/ss/ebitmap.c
+6
security/selinux/ss/ebitmap.c
···
153
153
if (offset == (u32)-1)
154
154
return 0;
155
155
156
+
/* don't waste ebitmap space if the netlabel bitmap is empty */
157
+
if (bitmap == 0) {
158
+
offset += EBITMAP_UNIT_SIZE;
159
+
continue;
160
+
}
161
+
156
162
if (e_iter == NULL ||
157
163
offset >= e_iter->startbit + EBITMAP_SIZE) {
158
164
e_prev = e_iter;