diff options
author | Eric Paris <eparis@redhat.com> | 2010-07-29 23:02:34 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2010-08-02 01:38:39 -0400 |
commit | 6371dcd36f649d9d07823f31400618155a20dde1 (patch) | |
tree | a08c4ed2ec77225abbfcc099e78ae8d643429787 /security/selinux/ss/services.c | |
parent | 016d825fe02cd20fd8803ca37a1e6d428fe878f6 (diff) |
selinux: convert the policy type_attr_map to flex_array
Current selinux policy can have over 3000 types. The type_attr_map in
policy is an array sized by the number of types times sizeof(struct ebitmap)
(12 on x86_64). Basic math tells us the array is going to be of length
3000 x 12 = 36,000 bytes. The largest 'safe' allocation on a long running
system is 16k. Most of the time a 32k allocation will work. But on long
running systems a 64k allocation (what we need) can fail quite regularly.
In order to deal with this I am converting the type_attr_map to use
flex_arrays. Let the library code deal with breaking this into PAGE_SIZE
pieces.
-v2
rework some of the if(!obj) BUG() to be BUG_ON(!obj)
drop flex_array_put() calls and just use a _get() object directly
-v3
make apply to James' tree (drop the policydb_write changes)
Signed-off-by: Eric Paris <eparis@redhat.com>
Acked-by: Stephen D. Smalley <sds@tycho.nsa.gov>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/selinux/ss/services.c')
-rw-r--r-- | security/selinux/ss/services.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 1de60ce90d9a..9ea2feca3cd4 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
@@ -50,6 +50,7 @@ | |||
50 | #include <linux/audit.h> | 50 | #include <linux/audit.h> |
51 | #include <linux/mutex.h> | 51 | #include <linux/mutex.h> |
52 | #include <linux/selinux.h> | 52 | #include <linux/selinux.h> |
53 | #include <linux/flex_array.h> | ||
53 | #include <net/netlabel.h> | 54 | #include <net/netlabel.h> |
54 | 55 | ||
55 | #include "flask.h" | 56 | #include "flask.h" |
@@ -626,8 +627,10 @@ static void context_struct_compute_av(struct context *scontext, | |||
626 | */ | 627 | */ |
627 | avkey.target_class = tclass; | 628 | avkey.target_class = tclass; |
628 | avkey.specified = AVTAB_AV; | 629 | avkey.specified = AVTAB_AV; |
629 | sattr = &policydb.type_attr_map[scontext->type - 1]; | 630 | sattr = flex_array_get(policydb.type_attr_map_array, scontext->type - 1); |
630 | tattr = &policydb.type_attr_map[tcontext->type - 1]; | 631 | BUG_ON(!sattr); |
632 | tattr = flex_array_get(policydb.type_attr_map_array, tcontext->type - 1); | ||
633 | BUG_ON(!tattr); | ||
631 | ebitmap_for_each_positive_bit(sattr, snode, i) { | 634 | ebitmap_for_each_positive_bit(sattr, snode, i) { |
632 | ebitmap_for_each_positive_bit(tattr, tnode, j) { | 635 | ebitmap_for_each_positive_bit(tattr, tnode, j) { |
633 | avkey.source_type = i + 1; | 636 | avkey.source_type = i + 1; |