apparmor: Fix smatch warning in aa_remove_profiles
authorJohn Johansen <john.johansen@canonical.com>
Thu, 21 Feb 2013 09:14:17 +0000 (01:14 -0800)
committerJohn Johansen <john.johansen@canonical.com>
Sun, 28 Apr 2013 07:39:34 +0000 (00:39 -0700)
smatch reports
  error: potential NULL dereference 'ns'.

this can not actually occur because it relies on aa_split_fqname setting
both ns_name and name as null but ns_name will actually always have a
value in this case.

so remove the unnecessary if (ns_name) conditional that is resulting
in the false positive further down.

Signed-off-by: John Johansen <john.johansen@canonical.com>
security/apparmor/policy.c

index f4ee72b..0f345c4 100644 (file)
@@ -1156,14 +1156,12 @@ ssize_t aa_remove_profiles(char *fqname, size_t size)
        if (fqname[0] == ':') {
                char *ns_name;
                name = aa_split_fqname(fqname, &ns_name);
-               if (ns_name) {
-                       /* released below */
-                       ns = aa_find_namespace(root, ns_name);
-                       if (!ns) {
-                               info = "namespace does not exist";
-                               error = -ENOENT;
-                               goto fail;
-                       }
+               /* released below */
+               ns = aa_find_namespace(root, ns_name);
+               if (!ns) {
+                       info = "namespace does not exist";
+                       error = -ENOENT;
+                       goto fail;
                }
        } else
                /* released below */