lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SELinux: drop useless (and incorrect) AVTAB_MAX_SIZE

Browse Source 
AVTAB_MAX_SIZE was a define which was supposed to be used in userspace to
define a maximally sized avtab when userspace wasn't sure how big of a table
it needed.  It doesn't make sense in the kernel since we always know our table
sizes.  The only place it is used we have a more appropiately named define
called AVTAB_MAX_HASH_BUCKETS, use that instead.

Signed-off-by: Eric Paris <eparis@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
This commit is contained in:
Eric Paris
2010-10-13 17:50:19 -04:00
committed by James Morris
parent 4419aae1f4
commit 00d85c83ac
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
security/selinux/ss/avtab.c
View File

@@ -266,8 +266,8 @@ int avtab_alloc(struct avtab *h, u32 nrules)
if (shift > 2) if (shift > 2)
shift = shift - 2; shift = shift - 2;
nslot = 1 << shift; nslot = 1 << shift;
if (nslot > MAX_AVTAB_SIZE) if (nslot > MAX_AVTAB_HASH_BUCKETS)
nslot = MAX_AVTAB_SIZE; nslot = MAX_AVTAB_HASH_BUCKETS;
mask = nslot - 1; mask = nslot - 1;
h->htable = kcalloc(nslot, sizeof(*(h->htable)), GFP_KERNEL); h->htable = kcalloc(nslot, sizeof(*(h->htable)), GFP_KERNEL);

1
security/selinux/ss/avtab.h
View File

@@ -85,7 +85,6 @@ void avtab_cache_destroy(void);
#define MAX_AVTAB_HASH_BITS 11 #define MAX_AVTAB_HASH_BITS 11
#define MAX_AVTAB_HASH_BUCKETS (1 << MAX_AVTAB_HASH_BITS) #define MAX_AVTAB_HASH_BUCKETS (1 << MAX_AVTAB_HASH_BITS)
#define MAX_AVTAB_HASH_MASK (MAX_AVTAB_HASH_BUCKETS-1) #define MAX_AVTAB_HASH_MASK (MAX_AVTAB_HASH_BUCKETS-1)
#define MAX_AVTAB_SIZE MAX_AVTAB_HASH_BUCKETS
#endif /* _SS_AVTAB_H_ */ #endif /* _SS_AVTAB_H_ */