2 files changed, 3 insertions, 2 deletions

diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index 074cad40ac66..d56517ac3bae 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -203,7 +203,7 @@ struct netlbl_lsm_secattr {
         u32 type;
         char *domain;
         struct netlbl_lsm_cache *cache;
-        union {
+        struct {
                 struct {
                         struct netlbl_lsm_secattr_catmap *cat;
                         u32 lvl;
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c
index c8f688a10041..ed0ca649d7db 100644
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@ -2803,7 +2803,8 @@ int security_netlbl_sid_to_secattr(u32 sid, struct netlbl_lsm_secattr *secattr)
                 rc = -ENOMEM;
                 goto netlbl_sid_to_secattr_failure;
         }
-        secattr->flags |= NETLBL_SECATTR_DOMAIN_CPY;
+        secattr->attr.secid = sid;
+        secattr->flags |= NETLBL_SECATTR_DOMAIN_CPY | NETLBL_SECATTR_SECID;
         mls_export_netlbl_lvl(ctx, secattr);
         rc = mls_export_netlbl_cat(ctx, secattr);
         if (rc != 0)