diff options
| author | Dave Jones <davej@redhat.com> | 2014-05-15 21:03:53 +0200 |
|---|---|---|
| committer | Paul Moore <pmoore@redhat.com> | 2014-05-15 23:07:55 +0200 |
| commit | 47dd0b76ace953bd2c0479076db0d3e3b9594003 (patch) | |
| tree | 7b3dddfbdcc1959ee789d7979efc9fee5f80e51c /security | |
| parent | selinux: conditionally reschedule in mls_convert_context while loading selinu... (diff) | |
| download | linux-47dd0b76ace953bd2c0479076db0d3e3b9594003.tar.xz linux-47dd0b76ace953bd2c0479076db0d3e3b9594003.zip | |
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')
| -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 @@ #include <linux/kernel.h> #include <linux/slab.h> #include <linux/errno.h> +#include <linux/sched.h> #include "hashtab.h" 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) u32 hvalue; struct hashtab_node *prev, *cur, *newnode; + cond_resched(); + if (!h || h->nel == HASHTAB_MAX_NODES) return -EINVAL; |