diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-09 18:02:43 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-09 18:02:43 -0500 |
| commit | 98d74e08b1194acea2626da22376a2aacabcf67e (patch) | |
| tree | fa12994e9bcbcedcb304f8c61f2b74a5dc60a1de /security/selinux/ss/ebitmap.c | |
| parent | e4fc5a1a2acab67867c9858cd4c8e9abb5b242f7 (diff) | |
| parent | 45e5421eb5bbcd9efa037d682dd357284e3ef982 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
SELinux: add more validity checks on policy load
SELinux: fix bug in new ebitmap code.
SELinux: suppress a warning for 64k pages.
Diffstat (limited to 'security/selinux/ss/ebitmap.c')
| -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 c1a6b22d48d9..920b5e36a1af 100644 --- a/security/selinux/ss/ebitmap.c +++ b/security/selinux/ss/ebitmap.c | |||
| @@ -129,8 +129,8 @@ int ebitmap_netlbl_export(struct ebitmap *ebmap, | |||
| 129 | cmap_sft = delta % NETLBL_CATMAP_MAPSIZE; | 129 | cmap_sft = delta % NETLBL_CATMAP_MAPSIZE; |
| 130 | c_iter->bitmap[cmap_idx] | 130 | c_iter->bitmap[cmap_idx] |
| 131 | |= e_iter->maps[cmap_idx] << cmap_sft; | 131 | |= e_iter->maps[cmap_idx] << cmap_sft; |
| 132 | e_iter = e_iter->next; | ||
| 133 | } | 132 | } |
| 133 | e_iter = e_iter->next; | ||
| 134 | } | 134 | } |
| 135 | 135 | ||
| 136 | return 0; | 136 | return 0; |
