diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-25 16:09:54 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-25 16:09:54 +0100 |
| commit | dbd004291ed31db280a3f2d7a1113a04e5e85af4 (patch) | |
| tree | 2527346fca970d3bd7187f3848e0b6cdef933f3e | |
| parent | Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| parent | netlabel: fix export of SELinux categories > 127 (diff) | |
| download | linux-dbd004291ed31db280a3f2d7a1113a04e5e85af4.tar.xz linux-dbd004291ed31db280a3f2d7a1113a04e5e85af4.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
netlabel: fix export of SELinux categories > 127
| -rw-r--r-- | security/selinux/ss/ebitmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/selinux/ss/ebitmap.c b/security/selinux/ss/ebitmap.c index 68c7348d1acc..04b6145d767f 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; } |