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:
  SELinux: Reduce max avtab size to avoid page allocation failures

parents 96e35b40 6c9ff101

security/selinux/ss/avtab.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -82,7 +82,7 @@ struct avtab_node avtab_search_node_next(struct avtab_node node, int specified
		void avtab_cache_init(void);
		void avtab_cache_destroy(void);

		#define MAX_AVTAB_HASH_BITS 13
		#define MAX_AVTAB_HASH_BITS 11
		#define MAX_AVTAB_HASH_BUCKETS (1 << MAX_AVTAB_HASH_BITS)
		#define MAX_AVTAB_HASH_MASK (MAX_AVTAB_HASH_BUCKETS-1)
		#define MAX_AVTAB_SIZE MAX_AVTAB_HASH_BUCKETS