36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From d3c2992ed0358c8e86a83c7f55fc529cba545298 Mon Sep 17 00:00:00 2001
|
|
From: Huaxin Lu <luhuaxin1@huawei.com>
|
|
Date: Thu, 16 Nov 2023 07:32:07 +0800
|
|
Subject: [PATCH] libsepol: add check for category value before printing
|
|
|
|
In mls_semantic_level_expand(), there is a explicitly determine
|
|
whether category is 0, which may cause an potential integer
|
|
overflow in error branch.
|
|
|
|
Signed-off-by: Huaxin Lu <luhuaxin1@huawei.com>
|
|
Acked-by: James Carter <jwcart2@gmail.com>
|
|
|
|
Reference: https://github.com/SELinuxProject/selinux/commit/d3c2992ed0358c8e86a83c7f55fc529cba545298
|
|
Conflict: NA
|
|
---
|
|
libsepol/src/expand.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libsepol/src/expand.c b/libsepol/src/expand.c
|
|
index ee5f9185..e63414b1 100644
|
|
--- a/libsepol/src/expand.c
|
|
+++ b/libsepol/src/expand.c
|
|
@@ -945,8 +945,8 @@ int mls_semantic_level_expand(mls_semantic_level_t * sl, mls_level_t * l,
|
|
for (cat = sl->cat; cat; cat = cat->next) {
|
|
if (!cat->low || cat->low > cat->high) {
|
|
ERR(h, "Category range is not valid %s.%s",
|
|
- p->p_cat_val_to_name[cat->low - 1],
|
|
- p->p_cat_val_to_name[cat->high - 1]);
|
|
+ cat->low > 0 ? p->p_cat_val_to_name[cat->low - 1] : "Invalid",
|
|
+ cat->high > 0 ? p->p_cat_val_to_name[cat->high - 1] : "Invalid");
|
|
return -1;
|
|
}
|
|
for (i = cat->low - 1; i < cat->high; i++) {
|
|
--
|
|
2.33.0
|