Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3dbbbe0e authored by James Morris's avatar James Morris
Browse files

Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into for-linus2

parents 1604f871 892e8cac

security/selinux/hooks.c

+2 −1
Original line number Diff line number Diff line
@@ -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.

security/selinux/ss/ebitmap.c

+6 −0
Original line number Diff line number Diff line
@@ -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;