40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From 44375cb4a21dfdf3ac037237c5529049123336c2 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Thu, 9 Nov 2023 14:51:19 +0100
|
|
Subject: [PATCH] libsepol: adjust type for saturation check
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Change the type for the number of primary names in a symtab to uint32_t,
|
|
which conforms to the bytes read and the type used in the symtab.
|
|
The type is important for the saturation check via is_saturated(), since
|
|
it checks against -1 casted to the specific type.
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
Acked-by: James Carter <jwcart2@gmail.com>
|
|
|
|
Reference: https://github.com/SELinuxProject/selinux/commit/44375cb4a21dfdf3ac037237c5529049123336c2
|
|
Conflict: NA
|
|
---
|
|
libsepol/src/policydb.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/libsepol/src/policydb.c b/libsepol/src/policydb.c
|
|
index f608aba4..bc7bc9dc 100644
|
|
--- a/libsepol/src/policydb.c
|
|
+++ b/libsepol/src/policydb.c
|
|
@@ -4120,8 +4120,8 @@ int policydb_read(policydb_t * p, struct policy_file *fp, unsigned verbose)
|
|
{
|
|
|
|
unsigned int i, j, r_policyvers;
|
|
- uint32_t buf[5];
|
|
- size_t len, nprim, nel;
|
|
+ uint32_t buf[5], nprim;
|
|
+ size_t len, nel;
|
|
char *policydb_str;
|
|
const struct policydb_compat_info *info;
|
|
unsigned int policy_type, bufindex;
|
|
--
|
|
2.33.0
|