selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()

Move the NetLabel secattr MLS category import logic into
mls_import_netlbl_cat() where it belongs, and use the
mls_import_netlbl_cat() function in security_netlbl_secattr_to_sid().

Reported-by: Rickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: Paul Moore <pmoore@redhat.com>

diff --git a/security/selinux/ss/mls.c b/security/selinux/ss/mls.c
index d307b37..e108884 100644 (file)
--- a/security/selinux/ss/mls.c
+++ b/security/selinux/ss/mls.c
@@ -654,19 +654,15 @@ int mls_import_netlbl_cat(struct context *context,
 
        rc = ebitmap_netlbl_import(&context->range.level[0].cat,
                                   secattr->attr.mls.cat);
-       if (rc != 0)
-               goto import_netlbl_cat_failure;
-
-       rc = ebitmap_cpy(&context->range.level[1].cat,
-                        &context->range.level[0].cat);
-       if (rc != 0)
+       if (rc)
                goto import_netlbl_cat_failure;
+       memcpy(&context->range.level[1].cat, &context->range.level[0].cat,
+              sizeof(context->range.level[0].cat));
 
        return 0;
 
 import_netlbl_cat_failure:
        ebitmap_destroy(&context->range.level[0].cat);
-       ebitmap_destroy(&context->range.level[1].cat);
        return rc;
 }
 #endif /* CONFIG_NETLABEL */

diff --cc security/selinux/ss/services.c
Simple merge