diff options
author | Dave Jones <davej@redhat.com> | 2014-05-15 15:03:53 -0400 |
---|---|---|
committer | Serge Hallyn <serge.hallyn@ubuntu.com> | 2014-06-03 15:21:50 -0400 |
commit | ed1c96429a6aa6ffd8c4ee3e80bcde28aad270bc (patch) | |
tree | 235ddd61f28c3030838ebbe5655fccfd1468042c /security/selinux | |
parent | 9a591f39a9d11df435652738e7f6e62a09c87909 (diff) |
selinux: conditionally reschedule in hashtab_insert while loading selinux policy
After silencing the sleeping warning in mls_convert_context() I started
seeing similar traces from hashtab_insert. Do a cond_resched there too.
Signed-off-by: Dave Jones <davej@redhat.com>
Acked-by: Stephen Smalley <sds@tycho.nsa.gov>
Signed-off-by: Paul Moore <pmoore@redhat.com>
Diffstat (limited to 'security/selinux')
-rw-r--r-- | security/selinux/ss/hashtab.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/security/selinux/ss/hashtab.c b/security/selinux/ss/hashtab.c index 933e735bb185..2cc496149842 100644 --- a/security/selinux/ss/hashtab.c +++ b/security/selinux/ss/hashtab.c | |||
@@ -6,6 +6,7 @@ | |||
6 | #include <linux/kernel.h> | 6 | #include <linux/kernel.h> |
7 | #include <linux/slab.h> | 7 | #include <linux/slab.h> |
8 | #include <linux/errno.h> | 8 | #include <linux/errno.h> |
9 | #include <linux/sched.h> | ||
9 | #include "hashtab.h" | 10 | #include "hashtab.h" |
10 | 11 | ||
11 | struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, const void *key), | 12 | struct hashtab *hashtab_create(u32 (*hash_value)(struct hashtab *h, const void *key), |
@@ -40,6 +41,8 @@ int hashtab_insert(struct hashtab *h, void *key, void *datum) | |||
40 | u32 hvalue; | 41 | u32 hvalue; |
41 | struct hashtab_node *prev, *cur, *newnode; | 42 | struct hashtab_node *prev, *cur, *newnode; |
42 | 43 | ||
44 | cond_resched(); | ||
45 | |||
43 | if (!h || h->nel == HASHTAB_MAX_NODES) | 46 | if (!h || h->nel == HASHTAB_MAX_NODES) |
44 | return -EINVAL; | 47 | return -EINVAL; |
45 | 48 | ||