diff options
| author | Eric Paris <eparis@redhat.com> | 2010-10-13 17:50:19 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2010-10-20 19:12:57 -0400 |
| commit | 00d85c83ac52e2c1a66397f1abc589f80c543425 (patch) | |
| tree | 86f297ed90f988d46e6bb8c56a60fbc3b3eb8d66 | |
| parent | 4419aae1f4f380a3fba0f4f12ffbbbdf3f267c51 (diff) | |
SELinux: drop useless (and incorrect) AVTAB_MAX_SIZE
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>
| -rw-r--r-- | security/selinux/ss/avtab.c | 4 | ||||
| -rw-r--r-- | security/selinux/ss/avtab.h | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/security/selinux/ss/avtab.c b/security/selinux/ss/avtab.c index 929480c6c430..77a917ccc045 100644 --- a/security/selinux/ss/avtab.c +++ b/security/selinux/ss/avtab.c | |||
| @@ -266,8 +266,8 @@ int avtab_alloc(struct avtab *h, u32 nrules) | |||
| 266 | if (shift > 2) | 266 | if (shift > 2) |
| 267 | shift = shift - 2; | 267 | shift = shift - 2; |
| 268 | nslot = 1 << shift; | 268 | nslot = 1 << shift; |
| 269 | if (nslot > MAX_AVTAB_SIZE) | 269 | if (nslot > MAX_AVTAB_HASH_BUCKETS) |
| 270 | nslot = MAX_AVTAB_SIZE; | 270 | nslot = MAX_AVTAB_HASH_BUCKETS; |
| 271 | mask = nslot - 1; | 271 | mask = nslot - 1; |
| 272 | 272 | ||
| 273 | h->htable = kcalloc(nslot, sizeof(*(h->htable)), GFP_KERNEL); | 273 | h->htable = kcalloc(nslot, sizeof(*(h->htable)), GFP_KERNEL); |
diff --git a/security/selinux/ss/avtab.h b/security/selinux/ss/avtab.h index cd4f734e2749..32bd8b39f820 100644 --- a/security/selinux/ss/avtab.h +++ b/security/selinux/ss/avtab.h | |||
| @@ -85,7 +85,6 @@ void avtab_cache_destroy(void); | |||
| 85 | #define MAX_AVTAB_HASH_BITS 11 | 85 | #define MAX_AVTAB_HASH_BITS 11 |
| 86 | #define MAX_AVTAB_HASH_BUCKETS (1 << MAX_AVTAB_HASH_BITS) | 86 | #define MAX_AVTAB_HASH_BUCKETS (1 << MAX_AVTAB_HASH_BITS) |
| 87 | #define MAX_AVTAB_HASH_MASK (MAX_AVTAB_HASH_BUCKETS-1) | 87 | #define MAX_AVTAB_HASH_MASK (MAX_AVTAB_HASH_BUCKETS-1) |
| 88 | #define MAX_AVTAB_SIZE MAX_AVTAB_HASH_BUCKETS | ||
| 89 | 88 | ||
| 90 | #endif /* _SS_AVTAB_H_ */ | 89 | #endif /* _SS_AVTAB_H_ */ |
| 91 | 90 | ||
