summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Moore <paul@paul-moore.com>2016-06-09 10:40:37 -0400
committerPaul Moore <paul@paul-moore.com>2016-06-09 10:40:37 -0400
commit8bebe88c0995f331b0614f413285ce2b1d6fe09c (patch)
treeb8ad1ea05b35f57ad672d0806307d8e03a9da9a9
parent02f06918156b32a584ff2dd9ebfa653abf4d8d5d (diff)
downloadop-kernel-dev-8bebe88c0995f331b0614f413285ce2b1d6fe09c.zip
op-kernel-dev-8bebe88c0995f331b0614f413285ce2b1d6fe09c.tar.gz
selinux: import NetLabel category bitmaps correctly
The existing ebitmap_netlbl_import() code didn't correctly handle the case where the ebitmap_node was not aligned/sized to a power of two, this patch fixes this (on x86_64 ebitmap_node contains six bitmaps making a range of 0..383). Signed-off-by: Paul Moore <paul@paul-moore.com>
-rw-r--r--security/selinux/ss/ebitmap.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c
index 57644b1..894b6cd 100644
--- a/security/selinux/ss/ebitmap.c
+++ b/security/selinux/ss/ebitmap.c
@@ -165,7 +165,7 @@ int ebitmap_netlbl_import(struct ebitmap *ebmap,
e_iter = kzalloc(sizeof(*e_iter), GFP_ATOMIC);
if (e_iter == NULL)
goto netlbl_import_failure;
- e_iter->startbit = offset & ~(EBITMAP_SIZE - 1);
+ e_iter->startbit = offset - (offset % EBITMAP_SIZE);
if (e_prev == NULL)
ebmap->node = e_iter;
else
OpenPOWER on IntegriCloud