From: John Johansen <john.johansen@canonical.com>
Date: Thu, 21 Feb 2013 09:14:17 +0000 (-0800)
Subject: apparmor: Fix smatch warning in aa_remove_profiles
X-Git-Tag: v3.11-rc1~103^2~13^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=41d1b3e868c263e8b43dd5903a70633e05ae58a6;p=profile%2Fivi%2Fkernel-x86-ivi.git

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>
---

diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c
index f4ee72b..0f345c4 100644
--- a/security/apparmor/policy.c
+++ b/security/apparmor/policy.c
@@ -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 */