Smack: Remove unnecessary smack_known_invalid

The invalid Smack label ("") and the Huh ("?") Smack label
serve the same purpose and having both is unnecessary.
While pulling out the invalid label it became clear that
the use of smack_from_secid() was inconsistent, so that
is repaired. The setting of inode labels to the invalid
label could never happen in a functional system, has
never been observed in the wild and is not what you'd
really want for a failure behavior in any case. That is
removed.

Signed-off-by: Casey Schaufler <casey@schaufler-ca.com>

1 files changed, 1 insertions, 6 deletions

diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index 23e5808a0970..356e3764cad9 100644
--- a/security/smack/smack_access.c
+++ b/security/smack/smack_access.c
@@ -36,11 +36,6 @@ struct smack_known smack_known_floor = {
         .smk_secid      = 5,
 };
 
-struct smack_known smack_known_invalid = {
-        .smk_known      = "",
-        .smk_secid      = 6,
-};
-
 struct smack_known smack_known_web = {
         .smk_known      = "@",
         .smk_secid      = 7,
@@ -615,7 +610,7 @@ struct smack_known *smack_from_secid(const u32 secid)
          * of a secid that is not on the list.
          */
         rcu_read_unlock();
-        return &smack_known_invalid;
+        return &smack_known_huh;
 }
 
 /*