Commit dbd00429 authored Feb 25, 2010 by Linus Torvalds

Merge branch 'for-linus' of...

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

parents 7491612c c36f74e6

security/selinux/ss/ebitmap.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;
		}