summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorJohn Johansen <john.johansen@canonical.com>2013-02-21 01:14:17 -0800
committerJohn Johansen <john.johansen@canonical.com>2013-04-28 00:39:34 -0700
commit41d1b3e868c263e8b43dd5903a70633e05ae58a6 (patch)
tree1dace2cef2649ec402faa980ff4ca4ac88eb86f6 /security
parentb492d50bf597b87ab7ea1e738ec837f74b11594e (diff)
downloadlinux-41d1b3e868c263e8b43dd5903a70633e05ae58a6.tar.bz2
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.c14
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)
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 */