Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00d85c83 authored by Eric Paris's avatar Eric Paris Committed by James Morris
Browse files

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: default avatarEric Paris <eparis@redhat.com>
Signed-off-by: default avatarJames Morris <jmorris@namei.org>
parent 4419aae1

security/selinux/ss/avtab.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

security/selinux/ss/avtab.h

+0 −1
Original line number Diff line number Diff line
@@ -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_ */