apparmor: Fix smatch warning in aa_remove_profiles

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>
This commit is contained in:
John Johansen
2013-02-21 01:14:17 -08:00
parent b492d50bf5
commit 41d1b3e868

View File

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