aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJoshua Roys <joshua.roys@gtri.gatech.edu>2010-02-24 18:52:44 -0500
committerJames Morris <jmorris@namei.org>2010-02-25 17:49:20 +1100
commitc36f74e67fa12202dbcb4ad92c5ac844f9d36b98 (patch)
tree13cf4be470470b32ce348202ab4ba6a342c39ed9 /security
parentbaac35c4155a8aa826c70acee6553368ca5243a2 (diff)
downloadmrst-s0i3-test-c36f74e67fa12202dbcb4ad92c5ac844f9d36b98.tar.gz
mrst-s0i3-test-c36f74e67fa12202dbcb4ad92c5ac844f9d36b98.tar.xz
mrst-s0i3-test-c36f74e67fa12202dbcb4ad92c5ac844f9d36b98.zip
netlabel: fix export of SELinux categories > 127
This fixes corrupted CIPSO packets when SELinux categories greater than 127 are used. The bug occured on the second (and later) loops through the while; the inner for loop through the ebitmap->maps array used the same index as the NetLabel catmap->bitmap array, even though the NetLabel bitmap is twice as long as the SELinux bitmap. Signed-off-by: Joshua Roys <joshua.roys@gtri.gatech.edu> Acked-by: Paul Moore <paul.moore@hp.com> Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security')
-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 68c7348d1ac..04b6145d767 100644
--- a/security/selinux/ss/ebitmap.c
+++ b/security/selinux/ss/ebitmap.c
@@ -128,7 +128,7 @@ int ebitmap_netlbl_export(struct ebitmap *ebmap,
cmap_idx = delta / NETLBL_CATMAP_MAPSIZE;
cmap_sft = delta % NETLBL_CATMAP_MAPSIZE;
c_iter->bitmap[cmap_idx]
- |= e_iter->maps[cmap_idx] << cmap_sft;
+ |= e_iter->maps[i] << cmap_sft;
}
e_iter = e_iter->next;
}