selinux: remove useless assignments
authorOndrej Mosnacek <omosnace@redhat.com>
Mon, 25 Mar 2019 08:11:15 +0000 (09:11 +0100)
committerPaul Moore <paul@paul-moore.com>
Mon, 25 Mar 2019 14:25:06 +0000 (10:25 -0400)
The code incorrectly assigned directly to the variables instead of the
values they point to. Since the values are already set to NULL/0 at the
beginning of the function, we can simply remove these useless
assignments.

Reported-by: Hariprasad Kelam <hariprasad.kelam@gmail.com>
Fixes: fede148324c3 ("selinux: log invalid contexts in AVCs")
Signed-off-by: Ondrej Mosnacek <omosnace@redhat.com>
[PM: removed a bad comment that was causing compiler warnings]
Signed-off-by: Paul Moore <paul@paul-moore.com>
security/selinux/ss/services.c

index ec62918..cc043bc 100644 (file)
@@ -1318,14 +1318,11 @@ static int security_sid_to_context_core(struct selinux_state *state,
                rc = -EINVAL;
                goto out_unlock;
        }
-       if (only_invalid && !context->len) {
-               scontext = NULL;
-               scontext_len = 0;
+       if (only_invalid && !context->len)
                rc = 0;
-       } else {
+       else
                rc = context_struct_to_string(policydb, context, scontext,
                                              scontext_len);
-       }
 out_unlock:
        read_unlock(&state->ss->policy_rwlock);
 out: