36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From e54bedce80267b4fbd79b16f548a278c097bd675 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
|
|
Date: Mon, 11 Dec 2023 15:55:40 +0100
|
|
Subject: [PATCH] libsepol: validate empty common classes in scope indices
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Validate no common classes inside scope indices are defined.
|
|
|
|
Reported-by: oss-fuzz (issue 64849)
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
Acked-by: James Carter <jwcart2@gmail.com>
|
|
|
|
Reference: https://github.com/SELinuxProject/selinux/commit/e54bedce80267b4fbd79b16f548a278c097bd675
|
|
Conflict: Context adaptation
|
|
---
|
|
libsepol/src/policydb_validate.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/libsepol/src/policydb_validate.c b/libsepol/src/policydb_validate.c
|
|
index bd8e9f8f3..d86f885e4 100644
|
|
--- a/libsepol/src/policydb_validate.c
|
|
+++ b/libsepol/src/policydb_validate.c
|
|
@@ -730,6 +730,8 @@ bad:
|
|
|
|
static int validate_scope_index(sepol_handle_t *handle, const scope_index_t *scope_index, validate_t flavors[])
|
|
{
|
|
+ if (!ebitmap_is_empty(&scope_index->scope[SYM_COMMONS]))
|
|
+ goto bad;
|
|
if (validate_ebitmap(&scope_index->p_classes_scope, &flavors[SYM_CLASSES]))
|
|
goto bad;
|
|
if (validate_ebitmap(&scope_index->p_roles_scope, &flavors[SYM_ROLES]))
|
|
--
|
|
2.33.0
|