Skip to contentSkip to conversation

correct return value handling in libsemanage

PATCH In review Karl MacMillan 3 participants 5 messages Dec 21, 2006 – Jan 5, 2007 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 correct return value handling in libsemanage

The function semanage_direct_commit in libsemanage:direct_api.c does not correctly propagate error codes. This patch fixes that.

src/direct_api.c +20 -12
diff -r 1ecfd5befe3f src/direct_api.c
@@ -603,7 +603,8 @@ static int semanage_direct_commit(semana
 
 		/* Create new policy object, then attach to policy databases
 		 * that work with a policydb */
-		if (semanage_expand_sandbox(sh, base, &out) < 0)
+		retval = semanage_expand_sandbox(sh, base, &out);
+		if (retval < 0)
 			goto cleanup;
 
 		dbase_policydb_attach((dbase_policydb_t *) pusers_base->dbase,
@@ -615,13 +616,16 @@ static int semanage_direct_commit(semana
 
 		/* ============= Apply changes, and verify  =============== */
 
-		if (semanage_base_merge_components(sh) < 0)
-			goto cleanup;
-
-		if (semanage_write_policydb(sh, out) < 0)
-			goto cleanup;
-
-		if (semanage_verify_kernel(sh) != 0)
+		retval = semanage_base_merge_components(sh);
+		if (retval < 0)
+			goto cleanup;
+
+		retval = semanage_write_policydb(sh, out);
+		if (retval < 0)
+			goto cleanup;
+
+		retval = semanage_verify_kernel(sh);
+		if (retval < 0)
 			goto cleanup;
 	}
 
@@ -635,26 +639,30 @@ static int semanage_direct_commit(semana
 	 * merged into the main file_contexts. We won't check the
 	 * large file_contexts - checked at compile time */
 	if (sh->do_rebuild || modified || fcontexts_modified) {
-		if (semanage_fcontext_validate_local(sh, out) < 0)
+		retval = semanage_fcontext_validate_local(sh, out);
+		if (retval < 0)
 			goto cleanup;
 	}
 
 	/* Validate local seusers against policy */
 	if (sh->do_rebuild || modified || seusers_modified) {
-		if (semanage_seuser_validate_local(sh, out) < 0)
+		retval = semanage_seuser_validate_local(sh, out);
+		if (retval < 0)
 			goto cleanup;
 	}
 
 	/* Validate local ports for overlap */
 	if (sh->do_rebuild || ports_modified) {
-		if (semanage_port_validate_local(sh) < 0)
+		retval = semanage_port_validate_local(sh);
+		if (retval < 0)
 			goto cleanup;
 	}
 
 	/* ================== Write non-policydb components ========= */
 
 	/* Commit changes to components */
-	if (semanage_commit_components(sh) < 0)
+	retval = semanage_commit_components(sh);
+	if (retval < 0)
 		goto cleanup;
 
 	retval = semanage_install_sandbox(sh);

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Karl MacMillan

The function semanage_direct_commit in libsemanage:direct_api.c does not correctly propagate error codes. This patch fixes that.

Quoted 80 lines

diff -r 1ecfd5befe3f src/direct_api.c

src/direct_api.c Thu Dec 21 17:47:06 2006 -0500 renamed from src/direct_api.c Thu Dec 21 17:09:45 2006 -0500 +20 -12
@@ -603,7 +603,8 @@ static int semanage_direct_commit(semana
 
         /* Create new policy object, then attach to policy databases
          * that work with a policydb */
-        if (semanage_expand_sandbox(sh, base, &out) < 0)
+        retval = semanage_expand_sandbox(sh, base, &out);
+        if (retval < 0)
             goto cleanup;
 
         dbase_policydb_attach((dbase_policydb_t *) pusers_base->dbase,
@@ -615,13 +616,16 @@ static int semanage_direct_commit(semana
 
         /* ============= Apply changes, and verify  =============== */
 
-        if (semanage_base_merge_components(sh) < 0)
-            goto cleanup;
-
-        if (semanage_write_policydb(sh, out) < 0)
-            goto cleanup;
-
-        if (semanage_verify_kernel(sh) != 0)
+        retval = semanage_base_merge_components(sh);
+        if (retval < 0)
+            goto cleanup;
+
+        retval = semanage_write_policydb(sh, out);
+        if (retval < 0)
+            goto cleanup;
+
+        retval = semanage_verify_kernel(sh);
+        if (retval < 0)
             goto cleanup;
     }
 
@@ -635,26 +639,30 @@ static int semanage_direct_commit(semana
      * merged into the main file_contexts. We won't check the
      * large file_contexts - checked at compile time */
     if (sh->do_rebuild || modified || fcontexts_modified) {
-        if (semanage_fcontext_validate_local(sh, out) < 0)
+        retval = semanage_fcontext_validate_local(sh, out);
+        if (retval < 0)
             goto cleanup;
     }
 
     /* Validate local seusers against policy */
     if (sh->do_rebuild || modified || seusers_modified) {
-        if (semanage_seuser_validate_local(sh, out) < 0)
+        retval = semanage_seuser_validate_local(sh, out);
+        if (retval < 0)
             goto cleanup;
     }
 
     /* Validate local ports for overlap */
     if (sh->do_rebuild || ports_modified) {
-        if (semanage_port_validate_local(sh) < 0)
+        retval = semanage_port_validate_local(sh);
+        if (retval < 0)
             goto cleanup;
     }
 
     /* ================== Write non-policydb components ========= */
 
     /* Commit changes to components */
-    if (semanage_commit_components(sh) < 0)
+    retval = semanage_commit_components(sh);
+    if (retval < 0)
         goto cleanup;
 
     retval = semanage_install_sandbox(sh);
Signature · 4 lines
-- 
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

#2 lore raw
Quoted 6 lines · Joshua Brindle
Quoted 4 lines · Karl MacMillan

The function semanage_direct_commit in libsemanage:direct_api.c does not correctly propagate error codes. This patch fixes that.

The patch I sent was against the rawhide CVS - turns out it doesn't apply cleanly to current upstream. This updated patch applies cleanly and makes all of the returns in that function consisten.

libsemanage/src/direct_api.c +30 -22
diff -r 46ccd195a21c libsemanage/src/direct_api.c
@@ -467,9 +467,11 @@ static int semanage_direct_commit(semana
 
 	/* Before we do anything else, flush the join to its component parts.
 	 * This *does not* flush to disk automatically */
-	if (users->dtable->is_modified(users->dbase) &&
-	    users->dtable->flush(sh, users->dbase) < 0)
-		goto cleanup;
+	if (users->dtable->is_modified(users->dbase)) {
+		retval = users->dtable->flush(sh, users->dbase);
+		if (retval < 0)
+			goto cleanup;
+	}
 
 	/* Decide if anything was modified */
 	fcontexts_modified = fcontexts->dtable->is_modified(fcontexts->dbase);
@@ -497,85 +499,97 @@ static int semanage_direct_commit(semana
 		/* =================== Module expansion =============== */
 
 		/* link all modules in the sandbox to the base module */
-		if (semanage_get_modules_names
-		    (sh, &mod_filenames, &num_modfiles) != 0
-		    || semanage_verify_modules(sh, mod_filenames,
-					       num_modfiles) == -1
-		    || semanage_link_sandbox(sh, &base) < 0) {
-			goto cleanup;
-		}
+		retval = semanage_get_modules_names(sh, &mod_filenames, &num_modfiles);
+		if (retval < 0)
+			goto cleanup;
+		retval = semanage_verify_modules(sh, mod_filenames, num_modfiles);
+		if (retval < 0)
+			goto cleanup;
+		retval = semanage_link_sandbox(sh, &base);
+		if (retval < 0)
+			goto cleanup;
 
 		/* write the linked base */
-		if ((linked_filename =
-		     semanage_path(SEMANAGE_TMP, SEMANAGE_LINKED)) == NULL
-		    || semanage_write_module(sh, linked_filename, base) == -1
-		    || semanage_verify_linked(sh) != 0) {
-			goto cleanup;
-		}
+		linked_filename = semanage_path(SEMANAGE_TMP, SEMANAGE_LINKED);
+		if (linked_filename == NULL) {
+			retval = -1;
+			goto cleanup;
+		}
+		retval = semanage_write_module(sh, linked_filename, base);
+		if (retval < 0)
+			goto cleanup;
+		retval = semanage_verify_linked(sh);
+		if (retval < 0)
+			goto cleanup;
 
 		/* ==================== File-backed ================== */
 
 		/* File Contexts */
 		/* Sort the file contexts. */
-		if (semanage_fc_sort
-		    (sh, sepol_module_package_get_file_contexts(base),
-		     sepol_module_package_get_file_contexts_len(base),
-		     &sorted_fc_buffer, &sorted_fc_buffer_len) == -1) {
-			goto cleanup;
-		}
+		retval = semanage_fc_sort(sh, sepol_module_package_get_file_contexts(base),
+					  sepol_module_package_get_file_contexts_len(base),
+					  &sorted_fc_buffer, &sorted_fc_buffer_len);
+		if (retval < 0)
+			goto cleanup;
 
 		/* Write the contexts (including template contexts) to a single file.
 		 * The buffer returned by the sort function has a trailing \0 character,
 		 * which we do NOT want to write out to disk, so we pass 

sorted_fc_buffer_len-1. */
- if ((ofilename =
- semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL)) == NULL
- || write_file(sh, ofilename, sorted_fc_buffer,
- sorted_fc_buffer_len - 1) == -1) {
- goto cleanup;
- }
+ ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL);
+ if (ofilename == NULL) {
+ retval = -1;
+ goto cleanup;
+ }
+ retval = write_file(sh, ofilename, sorted_fc_buffer,
+ sorted_fc_buffer_len - 1);
+ if (retval < 0)
+ goto cleanup;

/* Split complete and template file contexts into their separate
files. */
- if (semanage_split_fc(sh))
+ retval = semanage_split_fc(sh);
+ if (retval < 0)
goto cleanup;

pfcontexts->dtable->drop_cache(pfcontexts->dbase);

/* Seusers */
if (sepol_module_package_get_seusers_len(base)) {
- if ((ofilename =

-			     semanage_path(SEMANAGE_TMP,
-					   SEMANAGE_SEUSERS)) == NULL
-			    || write_file(sh, ofilename,
-					  sepol_module_package_get_seusers
-					  (base),
-					  sepol_module_package_get_seusers_len
-					  (base)) == -1) {

+ ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_SEUSERS);
+ if (ofilename == NULL) {
+ retval = -1;
goto cleanup;
}
+ retval = write_file(sh, ofilename,
+ sepol_module_package_get_seusers(base),
+ sepol_module_package_get_seusers_len(base));
+ if (retval < 0)
+ goto cleanup;
+
pseusers->dtable->drop_cache(pseusers->dbase);

} else {
- if (pseusers->dtable->clear(sh, pseusers->dbase) < 0)
+ retval = pseusers->dtable->clear(sh, pseusers->dbase);
+ if (retval < 0)
goto cleanup;
}

/* Users_extra */
if (sepol_module_package_get_user_extra_len(base)) {
- if ((ofilename =

-			     semanage_path(SEMANAGE_TMP,
-					   SEMANAGE_USERS_EXTRA)) == NULL
-			    || write_file(sh, ofilename,
-					  sepol_module_package_get_user_extra
-					  (base),
-					  sepol_module_package_get_user_extra_len
-					  (base)) == -1) {

+ ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_USERS_EXTRA);
+ if (ofilename == NULL) {
+ retval = -1;
goto cleanup;
}
+ retval = write_file(sh, ofilename,
+ sepol_module_package_get_user_extra(base),
+ sepol_module_package_get_user_extra_len(base));
+ if (retval < 0)
+ goto cleanup;
pusers_extra->dtable->drop_cache(pusers_extra->dbase);

} else {
- if (pusers_extra->dtable->
- clear(sh, pusers_extra->dbase) < 0)
+ retval = pusers_extra->dtable->clear(sh, pusers_extra->dbase);
+ if (retval < 0)
goto cleanup;
}

@@ -603,7 +617,8 @@ static int semanage_direct_commit(semana

/* Create new policy object, then attach to policy databases
* that work with a policydb */
- if (semanage_expand_sandbox(sh, base, &out) < 0)
+ retval = semanage_expand_sandbox(sh, base, &out);
+ if (retval < 0)
goto cleanup;

dbase_policydb_attach((dbase_policydb_t *) pusers_base->dbase,
@@ -615,13 +630,16 @@ static int semanage_direct_commit(semana

/* ============= Apply changes, and verify =============== */

- if (semanage_base_merge_components(sh) < 0)
- goto cleanup;
-
- if (semanage_write_policydb(sh, out) < 0)
- goto cleanup;
-
- if (semanage_verify_kernel(sh) != 0)
+ retval = semanage_base_merge_components(sh);
+ if (retval < 0)
+ goto cleanup;
+
+ retval = semanage_write_policydb(sh, out);
+ if (retval < 0)
+ goto cleanup;
+
+ retval = semanage_verify_kernel(sh);
+ if (retval < 0)
goto cleanup;
}

@@ -635,26 +653,30 @@ static int semanage_direct_commit(semana
* merged into the main file_contexts. We won't check the
* large file_contexts - checked at compile time */
if (sh->do_rebuild || modified || fcontexts_modified) {
- if (semanage_fcontext_validate_local(sh, out) < 0)
+ retval = semanage_fcontext_validate_local(sh, out);
+ if (retval < 0)
goto cleanup;
}

/* Validate local seusers against policy */ if (sh->do_rebuild || modified || seusers_modified) {
- if (semanage_seuser_validate_local(sh, out) < 0)
+ retval = semanage_seuser_validate_local(sh, out);
+ if (retval < 0)
goto cleanup;
}

/* Validate local ports for overlap */
if (sh->do_rebuild || ports_modified) {
- if (semanage_port_validate_local(sh) < 0)
+ retval = semanage_port_validate_local(sh);
+ if (retval < 0)
goto cleanup;
}

/* ================== Write non-policydb components ========= */

/* Commit changes to components */
- if (semanage_commit_components(sh) < 0)
+ retval = semanage_commit_components(sh);
+ if (retval < 0)
goto cleanup;

retval = semanage_install_sandbox(sh);

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

#3 lore raw
Quoted 10 lines · Karl MacMillan
Quoted 6 lines · Joshua Brindle
Quoted 4 lines · Karl MacMillan

The function semanage_direct_commit in libsemanage:direct_api.c does not correctly propagate error codes. This patch fixes that.

The patch I sent was against the rawhide CVS - turns out it doesn't apply cleanly to current upstream. This updated patch applies cleanly and makes all of the returns in that function consisten.

Oh good, I was beginning to think I had forgotten how to use patch over my vacation :)

I'll merge this and the patch to remove linked and backup copies soon if there are no objections.

Quoted 230 lines

diff -r 46ccd195a21c libsemanage/src/direct_api.c

libsemanage/src/direct_api.c Wed Jan 03 09:38:47 2007 -0500 renamed from libsemanage/src/direct_api.c Tue Dec 12 22:38:43 2006 -0500 +30 -22
@@ -467,9 +467,11 @@ static int semanage_direct_commit(semana
 
     /* Before we do anything else, flush the join to its component parts.
      * This *does not* flush to disk automatically */
-    if (users->dtable->is_modified(users->dbase) &&
-        users->dtable->flush(sh, users->dbase) < 0)
-        goto cleanup;
+    if (users->dtable->is_modified(users->dbase)) {
+        retval = users->dtable->flush(sh, users->dbase);
+        if (retval < 0)
+            goto cleanup;
+    }
 
     /* Decide if anything was modified */
     fcontexts_modified = fcontexts->dtable->is_modified(fcontexts->dbase);
@@ -497,85 +499,97 @@ static int semanage_direct_commit(semana
         /* =================== Module expansion =============== */
 
         /* link all modules in the sandbox to the base module */
-        if (semanage_get_modules_names
-            (sh, &mod_filenames, &num_modfiles) != 0
-            || semanage_verify_modules(sh, mod_filenames,
-                           num_modfiles) == -1
-            || semanage_link_sandbox(sh, &base) < 0) {
-            goto cleanup;
-        }
+        retval = semanage_get_modules_names(sh, &mod_filenames, 
 &num_modfiles);
+        if (retval < 0)
+            goto cleanup;
+        retval = semanage_verify_modules(sh, mod_filenames, num_modfiles);
+        if (retval < 0)
+            goto cleanup;
+        retval = semanage_link_sandbox(sh, &base);
+        if (retval < 0)
+            goto cleanup;
 
         /* write the linked base */
-        if ((linked_filename =
-             semanage_path(SEMANAGE_TMP, SEMANAGE_LINKED)) == NULL
-            || semanage_write_module(sh, linked_filename, base) == -1
-            || semanage_verify_linked(sh) != 0) {
-            goto cleanup;
-        }
+        linked_filename = semanage_path(SEMANAGE_TMP, SEMANAGE_LINKED);
+        if (linked_filename == NULL) {
+            retval = -1;
+            goto cleanup;
+        }
+        retval = semanage_write_module(sh, linked_filename, base);
+        if (retval < 0)
+            goto cleanup;
+        retval = semanage_verify_linked(sh);
+        if (retval < 0)
+            goto cleanup;
 
         /* ==================== File-backed ================== */
 
         /* File Contexts */
         /* Sort the file contexts. */
-        if (semanage_fc_sort
-            (sh, sepol_module_package_get_file_contexts(base),
-             sepol_module_package_get_file_contexts_len(base),
-             &sorted_fc_buffer, &sorted_fc_buffer_len) == -1) {
-            goto cleanup;
-        }
+        retval = semanage_fc_sort(sh, 
 sepol_module_package_get_file_contexts(base),
+                      sepol_module_package_get_file_contexts_len(base),
+                      &sorted_fc_buffer, &sorted_fc_buffer_len);
+        if (retval < 0)
+            goto cleanup;
 
         /* Write the contexts (including template contexts) to a single 

file.
* The buffer returned by the sort function has a trailing \0
character,
* which we do NOT want to write out to disk, so we pass
sorted_fc_buffer_len-1. */

libsemanage/src/direct_api.c Wed Jan 03 09:38:47 2007 -0500 renamed from libsemanage/src/direct_api.c Tue Dec 12 22:38:43 2006 -0500 +9 -6
-        if ((ofilename =
-             semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL)) == NULL
-            || write_file(sh, ofilename, sorted_fc_buffer,
-                  sorted_fc_buffer_len - 1) == -1) {
-            goto cleanup;
-        }
+        ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL);
+        if (ofilename == NULL) {
+            retval = -1;
+            goto cleanup;
+        }
+        retval = write_file(sh, ofilename, sorted_fc_buffer,
+                    sorted_fc_buffer_len - 1);
+        if (retval < 0)
+            goto cleanup;
 
         /* Split complete and template file contexts into their 

separate files. */

libsemanage/src/direct_api.c Wed Jan 03 09:38:47 2007 -0500 renamed from libsemanage/src/direct_api.c Tue Dec 12 22:38:43 2006 -0500 +41 -31
-        if (semanage_split_fc(sh))
+        retval = semanage_split_fc(sh);
+        if (retval < 0)
             goto cleanup;
 
         pfcontexts->dtable->drop_cache(pfcontexts->dbase);
 
         /* Seusers */
         if (sepol_module_package_get_seusers_len(base)) {
-            if ((ofilename =
-                 semanage_path(SEMANAGE_TMP,
-                       SEMANAGE_SEUSERS)) == NULL
-                || write_file(sh, ofilename,
-                      sepol_module_package_get_seusers
-                      (base),
-                      sepol_module_package_get_seusers_len
-                      (base)) == -1) {
+            ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_SEUSERS);
+            if (ofilename == NULL) {
+                retval = -1;
                 goto cleanup;
             }
+            retval = write_file(sh, ofilename,
+                        sepol_module_package_get_seusers(base),
+                        sepol_module_package_get_seusers_len(base));
+            if (retval < 0)
+                goto cleanup;
+
             pseusers->dtable->drop_cache(pseusers->dbase);
 
         } else {
-            if (pseusers->dtable->clear(sh, pseusers->dbase) < 0)
+            retval = pseusers->dtable->clear(sh, pseusers->dbase);
+            if (retval < 0)
                 goto cleanup;
         }
 
         /* Users_extra */
         if (sepol_module_package_get_user_extra_len(base)) {
-            if ((ofilename =
-                 semanage_path(SEMANAGE_TMP,
-                       SEMANAGE_USERS_EXTRA)) == NULL
-                || write_file(sh, ofilename,
-                      sepol_module_package_get_user_extra
-                      (base),
-                      sepol_module_package_get_user_extra_len
-                      (base)) == -1) {
+            ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_USERS_EXTRA);
+            if (ofilename == NULL) {
+                retval = -1;
                 goto cleanup;
             }
+            retval = write_file(sh, ofilename,
+                        sepol_module_package_get_user_extra(base),
+                        sepol_module_package_get_user_extra_len(base));
+            if (retval < 0)
+                goto cleanup;
             pusers_extra->dtable->drop_cache(pusers_extra->dbase);
 
         } else {
-            if (pusers_extra->dtable->
-                clear(sh, pusers_extra->dbase) < 0)
+            retval = pusers_extra->dtable->clear(sh, pusers_extra->dbase);
+            if (retval < 0)
                 goto cleanup;
         }
@@ -603,7 +617,8 @@ static int semanage_direct_commit(semana
 
         /* Create new policy object, then attach to policy databases
          * that work with a policydb */
-        if (semanage_expand_sandbox(sh, base, &out) < 0)
+        retval = semanage_expand_sandbox(sh, base, &out);
+        if (retval < 0)
             goto cleanup;
 
         dbase_policydb_attach((dbase_policydb_t *) pusers_base->dbase,
@@ -615,13 +630,16 @@ static int semanage_direct_commit(semana
 
         /* ============= Apply changes, and verify  =============== */
 
-        if (semanage_base_merge_components(sh) < 0)
-            goto cleanup;
-
-        if (semanage_write_policydb(sh, out) < 0)
-            goto cleanup;
-
-        if (semanage_verify_kernel(sh) != 0)
+        retval = semanage_base_merge_components(sh);
+        if (retval < 0)
+            goto cleanup;
+
+        retval = semanage_write_policydb(sh, out);
+        if (retval < 0)
+            goto cleanup;
+
+        retval = semanage_verify_kernel(sh);
+        if (retval < 0)
             goto cleanup;
     }
 
@@ -635,26 +653,30 @@ static int semanage_direct_commit(semana
      * merged into the main file_contexts. We won't check the
      * large file_contexts - checked at compile time */
     if (sh->do_rebuild || modified || fcontexts_modified) {
-        if (semanage_fcontext_validate_local(sh, out) < 0)
+        retval = semanage_fcontext_validate_local(sh, out);
+        if (retval < 0)
             goto cleanup;
     }
 
     /* Validate local seusers against policy */
     if (sh->do_rebuild || modified || seusers_modified) {
-        if (semanage_seuser_validate_local(sh, out) < 0)
+        retval = semanage_seuser_validate_local(sh, out);
+        if (retval < 0)
             goto cleanup;
     }
 
     /* Validate local ports for overlap */
     if (sh->do_rebuild || ports_modified) {
-        if (semanage_port_validate_local(sh) < 0)
+        retval = semanage_port_validate_local(sh);
+        if (retval < 0)
             goto cleanup;
     }

libsemanage/src/direct_api.c Wed Jan 03 09:38:47 2007 -0500 static int semanage_direct_commit(semana · line 682

Quoted 10 lines
libsemanage/src/direct_api.c Wed Jan 03 09:38:47 2007 -0500 renamed from libsemanage/src/direct_api.c Tue Dec 12 22:38:43 2006 -0500 +2 -1
 
     /* ================== Write non-policydb components ========= */
 
     /* Commit changes to components */
-    if (semanage_commit_components(sh) < 0)
+    retval = semanage_commit_components(sh);
+    if (retval < 0)
         goto cleanup;
 
     retval = semanage_install_sandbox(sh);

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

#4 lore raw
Quoted 15 lines · Joshua Brindle
Quoted 5 lines · Karl MacMillan
Quoted 4 lines · Joshua Brindle
Quoted 3 lines · Karl MacMillan

The function semanage_direct_commit in libsemanage:direct_api.c does not correctly propagate error codes. This patch fixes that.

Quoted 8 lines
Quoted 3 lines
Quoted 2 lines

The patch I sent was against the rawhide CVS - turns out it doesn't apply cleanly to current upstream. This updated patch applies cleanly and makes all of the returns in that function consisten.

Quoted 5 lines

Oh good, I was beginning to think I had forgotten how to use patch over my vacation :)

I'll merge this and the patch to remove linked and backup copies soon if there are no objections.

No objection to this one, but I think a few cleanups should be made to the other one prior to merging.

Quoted 248 lines
Quoted 231 lines

diff -r 46ccd195a21c libsemanage/src/direct_api.c

libsemanage/src/direct_api.c Wed Jan 03 09:38:47 2007 -0500 renamed from libsemanage/src/direct_api.c Tue Dec 12 22:38:43 2006 -0500 +30 -22
@@ -467,9 +467,11 @@ static int semanage_direct_commit(semana
 
     /* Before we do anything else, flush the join to its component parts.
      * This *does not* flush to disk automatically */
-    if (users->dtable->is_modified(users->dbase) &&
-        users->dtable->flush(sh, users->dbase) < 0)
-        goto cleanup;
+    if (users->dtable->is_modified(users->dbase)) {
+        retval = users->dtable->flush(sh, users->dbase);
+        if (retval < 0)
+            goto cleanup;
+    }
 
     /* Decide if anything was modified */
     fcontexts_modified = fcontexts->dtable->is_modified(fcontexts->dbase);
@@ -497,85 +499,97 @@ static int semanage_direct_commit(semana
         /* =================== Module expansion =============== */
 
         /* link all modules in the sandbox to the base module */
-        if (semanage_get_modules_names
-            (sh, &mod_filenames, &num_modfiles) != 0
-            || semanage_verify_modules(sh, mod_filenames,
-                           num_modfiles) == -1
-            || semanage_link_sandbox(sh, &base) < 0) {
-            goto cleanup;
-        }
+        retval = semanage_get_modules_names(sh, &mod_filenames, 
 &num_modfiles);
+        if (retval < 0)
+            goto cleanup;
+        retval = semanage_verify_modules(sh, mod_filenames, num_modfiles);
+        if (retval < 0)
+            goto cleanup;
+        retval = semanage_link_sandbox(sh, &base);
+        if (retval < 0)
+            goto cleanup;
 
         /* write the linked base */
-        if ((linked_filename =
-             semanage_path(SEMANAGE_TMP, SEMANAGE_LINKED)) == NULL
-            || semanage_write_module(sh, linked_filename, base) == -1
-            || semanage_verify_linked(sh) != 0) {
-            goto cleanup;
-        }
+        linked_filename = semanage_path(SEMANAGE_TMP, SEMANAGE_LINKED);
+        if (linked_filename == NULL) {
+            retval = -1;
+            goto cleanup;
+        }
+        retval = semanage_write_module(sh, linked_filename, base);
+        if (retval < 0)
+            goto cleanup;
+        retval = semanage_verify_linked(sh);
+        if (retval < 0)
+            goto cleanup;
 
         /* ==================== File-backed ================== */
 
         /* File Contexts */
         /* Sort the file contexts. */
-        if (semanage_fc_sort
-            (sh, sepol_module_package_get_file_contexts(base),
-             sepol_module_package_get_file_contexts_len(base),
-             &sorted_fc_buffer, &sorted_fc_buffer_len) == -1) {
-            goto cleanup;
-        }
+        retval = semanage_fc_sort(sh, 
 sepol_module_package_get_file_contexts(base),
+                      sepol_module_package_get_file_contexts_len(base),
+                      &sorted_fc_buffer, &sorted_fc_buffer_len);
+        if (retval < 0)
+            goto cleanup;
 
         /* Write the contexts (including template contexts) to a single 

file.
* The buffer returned by the sort function has a trailing \0
character,
* which we do NOT want to write out to disk, so we pass
sorted_fc_buffer_len-1. */

libsemanage/src/direct_api.c Wed Jan 03 09:38:47 2007 -0500 renamed from libsemanage/src/direct_api.c Tue Dec 12 22:38:43 2006 -0500 +9 -6
-        if ((ofilename =
-             semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL)) == NULL
-            || write_file(sh, ofilename, sorted_fc_buffer,
-                  sorted_fc_buffer_len - 1) == -1) {
-            goto cleanup;
-        }
+        ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_FC_TMPL);
+        if (ofilename == NULL) {
+            retval = -1;
+            goto cleanup;
+        }
+        retval = write_file(sh, ofilename, sorted_fc_buffer,
+                    sorted_fc_buffer_len - 1);
+        if (retval < 0)
+            goto cleanup;
 
         /* Split complete and template file contexts into their 

separate files. */

libsemanage/src/direct_api.c Wed Jan 03 09:38:47 2007 -0500 renamed from libsemanage/src/direct_api.c Tue Dec 12 22:38:43 2006 -0500 +41 -31
-        if (semanage_split_fc(sh))
+        retval = semanage_split_fc(sh);
+        if (retval < 0)
             goto cleanup;
 
         pfcontexts->dtable->drop_cache(pfcontexts->dbase);
 
         /* Seusers */
         if (sepol_module_package_get_seusers_len(base)) {
-            if ((ofilename =
-                 semanage_path(SEMANAGE_TMP,
-                       SEMANAGE_SEUSERS)) == NULL
-                || write_file(sh, ofilename,
-                      sepol_module_package_get_seusers
-                      (base),
-                      sepol_module_package_get_seusers_len
-                      (base)) == -1) {
+            ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_SEUSERS);
+            if (ofilename == NULL) {
+                retval = -1;
                 goto cleanup;
             }
+            retval = write_file(sh, ofilename,
+                        sepol_module_package_get_seusers(base),
+                        sepol_module_package_get_seusers_len(base));
+            if (retval < 0)
+                goto cleanup;
+
             pseusers->dtable->drop_cache(pseusers->dbase);
 
         } else {
-            if (pseusers->dtable->clear(sh, pseusers->dbase) < 0)
+            retval = pseusers->dtable->clear(sh, pseusers->dbase);
+            if (retval < 0)
                 goto cleanup;
         }
 
         /* Users_extra */
         if (sepol_module_package_get_user_extra_len(base)) {
-            if ((ofilename =
-                 semanage_path(SEMANAGE_TMP,
-                       SEMANAGE_USERS_EXTRA)) == NULL
-                || write_file(sh, ofilename,
-                      sepol_module_package_get_user_extra
-                      (base),
-                      sepol_module_package_get_user_extra_len
-                      (base)) == -1) {
+            ofilename = semanage_path(SEMANAGE_TMP, SEMANAGE_USERS_EXTRA);
+            if (ofilename == NULL) {
+                retval = -1;
                 goto cleanup;
             }
+            retval = write_file(sh, ofilename,
+                        sepol_module_package_get_user_extra(base),
+                        sepol_module_package_get_user_extra_len(base));
+            if (retval < 0)
+                goto cleanup;
             pusers_extra->dtable->drop_cache(pusers_extra->dbase);
 
         } else {
-            if (pusers_extra->dtable->
-                clear(sh, pusers_extra->dbase) < 0)
+            retval = pusers_extra->dtable->clear(sh, pusers_extra->dbase);
+            if (retval < 0)
                 goto cleanup;
         }
@@ -603,7 +617,8 @@ static int semanage_direct_commit(semana
 
         /* Create new policy object, then attach to policy databases
          * that work with a policydb */
-        if (semanage_expand_sandbox(sh, base, &out) < 0)
+        retval = semanage_expand_sandbox(sh, base, &out);
+        if (retval < 0)
             goto cleanup;
 
         dbase_policydb_attach((dbase_policydb_t *) pusers_base->dbase,
@@ -615,13 +630,16 @@ static int semanage_direct_commit(semana
 
         /* ============= Apply changes, and verify  =============== */
 
-        if (semanage_base_merge_components(sh) < 0)
-            goto cleanup;
-
-        if (semanage_write_policydb(sh, out) < 0)
-            goto cleanup;
-
-        if (semanage_verify_kernel(sh) != 0)
+        retval = semanage_base_merge_components(sh);
+        if (retval < 0)
+            goto cleanup;
+
+        retval = semanage_write_policydb(sh, out);
+        if (retval < 0)
+            goto cleanup;
+
+        retval = semanage_verify_kernel(sh);
+        if (retval < 0)
             goto cleanup;
     }
 
@@ -635,26 +653,30 @@ static int semanage_direct_commit(semana
      * merged into the main file_contexts. We won't check the
      * large file_contexts - checked at compile time */
     if (sh->do_rebuild || modified || fcontexts_modified) {
-        if (semanage_fcontext_validate_local(sh, out) < 0)
+        retval = semanage_fcontext_validate_local(sh, out);
+        if (retval < 0)
             goto cleanup;
     }
 
     /* Validate local seusers against policy */
     if (sh->do_rebuild || modified || seusers_modified) {
-        if (semanage_seuser_validate_local(sh, out) < 0)
+        retval = semanage_seuser_validate_local(sh, out);
+        if (retval < 0)
             goto cleanup;
     }
 
     /* Validate local ports for overlap */
     if (sh->do_rebuild || ports_modified) {
-        if (semanage_port_validate_local(sh) < 0)
+        retval = semanage_port_validate_local(sh);
+        if (retval < 0)
             goto cleanup;
     }

libsemanage/src/direct_api.c Wed Jan 03 09:38:47 2007 -0500 static int semanage_direct_commit(semana · line 682

Quoted 10 lines
libsemanage/src/direct_api.c Wed Jan 03 09:38:47 2007 -0500 renamed from libsemanage/src/direct_api.c Tue Dec 12 22:38:43 2006 -0500 +2 -1
 
     /* ================== Write non-policydb components ========= */
 
     /* Commit changes to components */
-    if (semanage_commit_components(sh) < 0)
+    retval = semanage_commit_components(sh);
+    if (retval < 0)
         goto cleanup;
 
     retval = semanage_install_sandbox(sh);

--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.

Signature · 8 lines
Stephen Smalley
National Security Agency


--
This message was distributed to subscribers of the selinux mailing list.
If you no longer wish to subscribe, send mail to [email protected] with
the words "unsubscribe selinux" without quotes as the message.