diff options
author | John Johansen <john.johansen@canonical.com> | 2013-02-21 04:14:17 -0500 |
---|---|---|
committer | John Johansen <john.johansen@canonical.com> | 2013-04-28 03:39:34 -0400 |
commit | 41d1b3e868c263e8b43dd5903a70633e05ae58a6 (patch) | |
tree | 1dace2cef2649ec402faa980ff4ca4ac88eb86f6 /security | |
parent | b492d50bf597b87ab7ea1e738ec837f74b11594e (diff) |
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>
Diffstat (limited to 'security')
-rw-r--r-- | security/apparmor/policy.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/security/apparmor/policy.c b/security/apparmor/policy.c index f4ee72b44de4..0f345c4dee5f 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) | |||
1156 | if (fqname[0] == ':') { | 1156 | if (fqname[0] == ':') { |
1157 | char *ns_name; | 1157 | char *ns_name; |
1158 | name = aa_split_fqname(fqname, &ns_name); | 1158 | name = aa_split_fqname(fqname, &ns_name); |
1159 | if (ns_name) { | 1159 | /* released below */ |
1160 | /* released below */ | 1160 | ns = aa_find_namespace(root, ns_name); |
1161 | ns = aa_find_namespace(root, ns_name); | 1161 | if (!ns) { |
1162 | if (!ns) { | 1162 | info = "namespace does not exist"; |
1163 | info = "namespace does not exist"; | 1163 | error = -ENOENT; |
1164 | error = -ENOENT; | 1164 | goto fail; |
1165 | goto fail; | ||
1166 | } | ||
1167 | } | 1165 | } |
1168 | } else | 1166 | } else |
1169 | /* released below */ | 1167 | /* released below */ |