Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next

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;