Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  selinux: Fix an uninitialized variable BUG/panic in selinux_secattr_to_sid()
  selinux: use default proc sid on symlinks
  file capabilities: uninline cap_safe_nice
  Update selinux info in MAINTAINERS and Kconfig help text
  SELinux: add gitignore file for mdp script
  SELinux: add boundary support and thread context assignment
  securityfs: do not depend on CONFIG_SECURITY
  selinux: add support for installing a dummy policy (v2)
  security: add/fix security kernel-doc
  selinux: Unify for- and while-loop style
  selinux: conditional expression type validation was off-by-one
  smack: limit privilege by label
  SELinux: Fix a potentially uninitialised variable in SELinux hooks
  SELinux: trivial, remove unneeded local variable
  SELinux: Trivial minor fixes that change C null character style
  make selinux_write_opts() static

1 files changed, 3 insertions, 3 deletions

diff --git a/security/selinux/ss/hashtab.c b/security/selinux/ss/hashtab.c
index 2e7788e13213..933e735bb185 100644
--- a/security/selinux/ss/hashtab.c
+++ b/security/selinux/ss/hashtab.c
@@ -81,7 +81,7 @@ void *hashtab_search(struct hashtab *h, const void *key)
 
         hvalue = h->hash_value(h, key);
         cur = h->htable[hvalue];
-        while (cur != NULL && h->keycmp(h, key, cur->key) > 0)
+        while (cur && h->keycmp(h, key, cur->key) > 0)
                 cur = cur->next;
 
         if (cur == NULL || (h->keycmp(h, key, cur->key) != 0))
@@ -100,7 +100,7 @@ void hashtab_destroy(struct hashtab *h)
 
         for (i = 0; i < h->size; i++) {
                 cur = h->htable[i];
-                while (cur != NULL) {
+                while (cur) {
                         temp = cur;
                         cur = cur->next;
                         kfree(temp);
@@ -127,7 +127,7 @@ int hashtab_map(struct hashtab *h,
 
         for (i = 0; i < h->size; i++) {
                 cur = h->htable[i];
-                while (cur != NULL) {
+                while (cur) {
                         ret = apply(cur->key, cur->datum, args);
                         if (ret)
                                 return ret;