Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-3.10.git] / security / selinux / ss / services.c

diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index 2947cf85dc5604983482ded8e395f32ea3839ef1..bfa5a7dd6cf5455960034d55163d9a9ed02bfa3c 100644 (file)
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -1705,11 +1705,9 @@ out:
 err:
        if (*names) {
                for (i = 0; i < *len; i++)
-                       if ((*names)[i])
-                               kfree((*names)[i]);
+                       kfree((*names)[i]);
        }
-       if (*values)
-               kfree(*values);
+       kfree(*values);
        goto out;
 }