Merge tag 'platform-drivers-x86-v4.10-1' of git://git.infradead.org/users/dvhart...

[linux-2.6-microblaze.git] / security / smack / smack_access.c

diff --git a/security/smack/smack_access.c b/security/smack/smack_access.c
index 23e5808..356e376 100644 (file)
--- 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;
 }
 
 /*