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

Commit 087feb98 authored by KaiGai Kohei's avatar KaiGai Kohei Committed by James Morris
Browse files

SELinux: kills warnings in Improve SELinux performance when AVC misses 



This patch kills ugly warnings when the "Improve SELinux performance
when ACV misses" patch.

Signed-off-by: default avatarKaiGai Kohei <kaigai@ak.jp.nec.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 9fe79ad1

security/selinux/ss/ebitmap.c

+5 −6
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ int ebitmap_netlbl_import(struct ebitmap *ebmap, 
			e_sft = delta % EBITMAP_UNIT_SIZE;

			while (map) {

				e_iter->maps[e_idx++] |= map & (-1UL);

				map >>= EBITMAP_UNIT_SIZE;

				map = EBITMAP_SHIFT_UNIT_SIZE(map);

			}

		}

		c_iter = c_iter->next;
@@ -389,13 +389,13 @@ int ebitmap_read(struct ebitmap *e, void *fp) 


		if (startbit & (mapunit - 1)) {

			printk(KERN_ERR "security: ebitmap start bit (%d) is "

			       "not a multiple of the map unit size (%Zd)\n",

			       "not a multiple of the map unit size (%u)\n",

			       startbit, mapunit);

			goto bad;

		}

		if (startbit > e->highbit - mapunit) {

			printk(KERN_ERR "security: ebitmap start bit (%d) is "

			       "beyond the end of the bitmap (%Zd)\n",

			       "beyond the end of the bitmap (%u)\n",

			       startbit, (e->highbit - mapunit));

			goto bad;

		}
@@ -433,9 +433,8 @@ int ebitmap_read(struct ebitmap *e, void *fp) 


		index = (startbit - n->startbit) / EBITMAP_UNIT_SIZE;

		while (map) {

			n->maps[index] = map & (-1UL);

			map = map >> EBITMAP_UNIT_SIZE;

			index++;

			n->maps[index++] = map & (-1UL);

			map = EBITMAP_SHIFT_UNIT_SIZE(map);

		}

	}

ok:

security/selinux/ss/ebitmap.h

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#define EBITMAP_UNIT_SIZE	BITS_PER_LONG

#define EBITMAP_SIZE		(EBITMAP_UNIT_NUMS * EBITMAP_UNIT_SIZE)

#define EBITMAP_BIT		1ULL

#define EBITMAP_SHIFT_UNIT_SIZE(x)					\

	(((x) >> EBITMAP_UNIT_SIZE / 2) >> EBITMAP_UNIT_SIZE / 2)



struct ebitmap_node {

	struct ebitmap_node *next;