redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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: KaiGai Kohei <kaigai@ak.jp.nec.com>
Signed-off-by: James Morris <jmorris@namei.org>
hifive-unleashed-5.1
KaiGai Kohei 2007-10-03 23:42:56 +09:00 committed by James Morris
parent 9fe79ad1e4
commit 087feb9804
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
security/selinux/ss/ebitmap.c
View File

@ -193,7 +193,7 @@ int ebitmap_netlbl_import(struct ebitmap *ebmap,
e_sft = delta % EBITMAP_UNIT_SIZE; e_sft = delta % EBITMAP_UNIT_SIZE;
while (map) { while (map) {
e_iter->maps[e_idx++] |= map & (-1UL); e_iter->maps[e_idx++] |= map & (-1UL);
map >>= EBITMAP_UNIT_SIZE; map = EBITMAP_SHIFT_UNIT_SIZE(map);
} }
} }
c_iter = c_iter->next; c_iter = c_iter->next;
@ -389,13 +389,13 @@ int ebitmap_read(struct ebitmap *e, void *fp)
if (startbit & (mapunit - 1)) { if (startbit & (mapunit - 1)) {
printk(KERN_ERR "security: ebitmap start bit (%d) is " 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); startbit, mapunit);
goto bad; goto bad;
} }
if (startbit > e->highbit - mapunit) { if (startbit > e->highbit - mapunit) {
printk(KERN_ERR "security: ebitmap start bit (%d) is " 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)); startbit, (e->highbit - mapunit));
goto bad; goto bad;
} }
@ -433,9 +433,8 @@ int ebitmap_read(struct ebitmap *e, void *fp)
index = (startbit - n->startbit) / EBITMAP_UNIT_SIZE; index = (startbit - n->startbit) / EBITMAP_UNIT_SIZE;
while (map) { while (map) {
n->maps[index] = map & (-1UL); n->maps[index++] = map & (-1UL);
map = map >> EBITMAP_UNIT_SIZE; map = EBITMAP_SHIFT_UNIT_SIZE(map);
index++;
} }
} }
ok: ok:

2
security/selinux/ss/ebitmap.h
View File

@ -21,6 +21,8 @@
#define EBITMAP_UNIT_SIZE BITS_PER_LONG #define EBITMAP_UNIT_SIZE BITS_PER_LONG
#define EBITMAP_SIZE (EBITMAP_UNIT_NUMS * EBITMAP_UNIT_SIZE) #define EBITMAP_SIZE (EBITMAP_UNIT_NUMS * EBITMAP_UNIT_SIZE)
#define EBITMAP_BIT 1ULL #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 {
struct ebitmap_node *next; struct ebitmap_node *next;