selinux: remove redundant assignment to str
authorColin Ian King <colin.king@canonical.com>
Sat, 14 Oct 2017 12:46:55 +0000 (13:46 +0100)
committerPaul Moore <paul@paul-moore.com>
Mon, 16 Oct 2017 22:34:25 +0000 (18:34 -0400)
str is being assigned to an empty string but str is never being
read after that, so the assignment is redundant and can be removed.
Moving the declaration of str to a more localised block, cleans up
clang warning: "Value stored to 'str' is never read"

Signed-off-by: Colin Ian King <colin.king@canonical.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
security/selinux/hooks.c

index 2dd4dd6bdbc16346cd00f50cf31e04844e81305f..f21f1e0e6452570c48cac09dc5c76a6b726c00eb 100644 (file)
@@ -3176,18 +3176,17 @@ static int selinux_inode_setxattr(struct dentry *dentry, const char *name,
                if (!has_cap_mac_admin(true)) {
                        struct audit_buffer *ab;
                        size_t audit_size;
-                       const char *str;
 
                        /* We strip a nul only if it is at the end, otherwise the
                         * context contains a nul and we should audit that */
                        if (value) {
-                               str = value;
+                               const char *str = value;
+
                                if (str[size - 1] == '\0')
                                        audit_size = size - 1;
                                else
                                        audit_size = size;
                        } else {
-                               str = "";
                                audit_size = 0;
                        }
                        ab = audit_log_start(current->audit_context, GFP_ATOMIC, AUDIT_SELINUX_ERR);