From b328356a508dcbc4677b3b7370eb7f3988ea346b Mon Sep 17 00:00:00 2001 From: Eric Paris Date: Wed, 13 Oct 2010 17:50:19 -0400 Subject: [PATCH] --- yaml --- r: 211683 b: refs/heads/master c: 00d85c83ac52e2c1a66397f1abc589f80c543425 h: refs/heads/master i: 211681: 783baf2b66240ea50564799c83aa4119a2322ae7 211679: c99c546f3dea5fe8dd392b0ea6add9db81393765 v: v3 --- [refs] | 2 +- trunk/security/selinux/ss/avtab.c | 4 ++-- trunk/security/selinux/ss/avtab.h | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e79f34974829..1fc86dd0ecfe 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4419aae1f4f380a3fba0f4f12ffbbbdf3f267c51 +refs/heads/master: 00d85c83ac52e2c1a66397f1abc589f80c543425 diff --git a/trunk/security/selinux/ss/avtab.c b/trunk/security/selinux/ss/avtab.c index 929480c6c430..77a917ccc045 100644 --- a/trunk/security/selinux/ss/avtab.c +++ b/trunk/security/selinux/ss/avtab.c @@ -266,8 +266,8 @@ int avtab_alloc(struct avtab *h, u32 nrules) if (shift > 2) shift = shift - 2; nslot = 1 << shift; - if (nslot > MAX_AVTAB_SIZE) - nslot = MAX_AVTAB_SIZE; + if (nslot > MAX_AVTAB_HASH_BUCKETS) + nslot = MAX_AVTAB_HASH_BUCKETS; mask = nslot - 1; h->htable = kcalloc(nslot, sizeof(*(h->htable)), GFP_KERNEL); diff --git a/trunk/security/selinux/ss/avtab.h b/trunk/security/selinux/ss/avtab.h index cd4f734e2749..32bd8b39f820 100644 --- a/trunk/security/selinux/ss/avtab.h +++ b/trunk/security/selinux/ss/avtab.h @@ -85,7 +85,6 @@ void avtab_cache_destroy(void); #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 #endif /* _SS_AVTAB_H_ */