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/hashtab.c | |
| parent | 2fd4e6698f0863f47558e63b67c7c3a026513541 (diff) | |
| parent | 47dd0b76ace953bd2c0479076db0d3e3b9594003 (diff) | |
Merge branch 'next' of git://git.infradead.org/users/pcmoore/selinux into next
Diffstat (limited to 'security/selinux/ss/hashtab.c')
| -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 933e735bb18..2cc49614984 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; |