Skip to contentSkip to conversation

libsepol: Ensure dst gets set when copying range transitions

PATCH In review James Carter 2 participants 3 messages Jun 4 – Jun 5 SELinux security module

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 libsepol: Ensure dst gets set when copying range transitions

If there are no range transition rules or an error occurs when malloc'ing the first rule, dst will never get set.

Set dst to NULL immiediately and when exiting upon an error after the range transition rule list has been destroyed.

---
 libsepol/src/link.c | 2 ++
 1 file changed, 2 insertions(+)
libsepol/src/link.c +2 -0
index 004bb61a..70742fc8 100644
@@ -1498,6 +1498,7 @@ static int copy_range_trans_list(range_trans_rule_t *rules,
 {
 	range_trans_rule_t *rule, *new_rule = NULL;
 
+	*dst = NULL;
 	for (rule = rules; rule; rule = rule->next) {
 		new_rule = (range_trans_rule_t *)malloc(
 			sizeof(range_trans_rule_t));
@@ -1528,6 +1529,7 @@ static int copy_range_trans_list(range_trans_rule_t *rules,
 cleanup:
 	ERR(state->handle, "Out of memory!");
 	range_trans_rule_list_destroy(new_rule);
+	*dst = NULL;
 	return -1;
 }
 
Signature · 1 line
2.54.0
maintainer Acked-by on v1 1/1
#1 lore raw
Quoted 8 lines · James Carter

If there are no range transition rules or an error occurs when malloc'ing the first rule, dst will never get set.

Set dst to NULL immiediately and when exiting upon an error after the range transition rule list has been destroyed.

Quoted 28 lines
---
 libsepol/src/link.c | 2 ++
 1 file changed, 2 insertions(+)
libsepol/src/link.c +2 -1
index 004bb61a..70742fc8 100644
@@ -1498,6 +1498,7 @@ static int copy_range_trans_list(range_trans_rule_t *rules,
 {
        range_trans_rule_t *rule, *new_rule = NULL;
 
+       *dst = NULL;
        for (rule = rules; rule; rule = rule->next) {
                new_rule = (range_trans_rule_t *)malloc(
                        sizeof(range_trans_rule_t));
@@ -1528,6 +1529,7 @@ static int copy_range_trans_list(range_trans_rule_t *rules,
 cleanup:
        ERR(state->handle, "Out of memory!");
        range_trans_rule_list_destroy(new_rule);
+       *dst = NULL;
        return -1;
 }
 
--

2.54.0

#2 lore raw
Quoted 6 lines · Stephen Smalley
Quoted 4 lines · James Carter

If there are no range transition rules or an error occurs when malloc'ing the first rule, dst will never get set.

Quoted 7 lines
Quoted 4 lines

Set dst to NULL immiediately and when exiting upon an error after the range transition rule list has been destroyed.

Merged.
Jim

Quoted 28 lines
Quoted 28 lines
---
 libsepol/src/link.c | 2 ++
 1 file changed, 2 insertions(+)
libsepol/src/link.c +2 -1
index 004bb61a..70742fc8 100644
@@ -1498,6 +1498,7 @@ static int copy_range_trans_list(range_trans_rule_t *rules,
 {
        range_trans_rule_t *rule, *new_rule = NULL;
 
+       *dst = NULL;
        for (rule = rules; rule; rule = rule->next) {
                new_rule = (range_trans_rule_t *)malloc(
                        sizeof(range_trans_rule_t));
@@ -1528,6 +1529,7 @@ static int copy_range_trans_list(range_trans_rule_t *rules,
 cleanup:
        ERR(state->handle, "Out of memory!");
        range_trans_rule_list_destroy(new_rule);
+       *dst = NULL;
        return -1;
 }
 
--

2.54.0