diff options
| author |   James Morris <james.l.morris@oracle.com> | 2014-05-26 22:38:46 +1000 |
|---|---|---|
| committer | James Morris <james.l.morris@oracle.com> | 2014-05-26 22:38:46 +1000 |
| commit | 92953ff38ba59b4f7b1a54ab28b84be35fafaecc (patch) | |
| tree | 235ddd61f28c3030838ebbe5655fccfd1468042c /security/selinux/ss/mls.c | |
| parent | Merge branch 'smack-for-3.16' of git://git.gitorious.org/smack-next/kernel into next (diff) | |
| parent | selinux: conditionally reschedule in hashtab_insert while loading selinux policy (diff) | |
| download | linux-dev-92953ff38ba59b4f7b1a54ab28b84be35fafaecc.tar.xz linux-dev-92953ff38ba59b4f7b1a54ab28b84be35fafaecc.zip | |
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/selinux/ss/mls.c')
| -rw-r--r-- | security/selinux/ss/mls.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c index c85bc1ec040c..d307b37ddc2b 100644 --- a/security/selinux/ss/mls.c +++ b/security/selinux/ss/mls.c @@ -492,6 +492,8 @@ int mls_convert_context(struct policydb *oldp, rc = ebitmap_set_bit(&bitmap, catdatum->value - 1, 1); if (rc) return rc; + + cond_resched(); } ebitmap_destroy(&c->range.level[l].cat); c->range.level[l].cat = bitmap; |