76 lines
2.2 KiB
Diff
76 lines
2.2 KiB
Diff
From e22b7dee0d8de9bc49992fa80b9ceb53925ea36c Mon Sep 17 00:00:00 2001
|
|
From: root <root@localhost.localdomain>
|
|
Date: Mon, 8 Jan 2024 17:16:30 +0800
|
|
Subject: [PATCH] libsepol: reject unsupported policy capabilities
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Kernel policies with unsupported policy capabilities enabled can
|
|
currently be parsed, since they result just in a bit set inside an
|
|
ebitmap. Writing such a loaded policy into the traditional language or
|
|
CIL will fail however, since the unsupported policy capabilities can not
|
|
be converted into a name.
|
|
|
|
Reject kernel policies with invalid policy capabilities.
|
|
|
|
Reported-by: oss-fuzz (issue 60573)
|
|
|
|
Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
|
|
Acked-by: James Carter <jwcart2@gmail.com>
|
|
|
|
Reference: https://github.com/SELinuxProject/selinux/commit/7cf2bfb59313eeef59e916834c3243b7a0ce7b4f
|
|
Conflict: Context adaptation
|
|
---
|
|
libsepol/src/policydb_validate.c | 21 +++++++++++++++++++++
|
|
1 file changed, 21 insertions(+)
|
|
|
|
diff --git a/libsepol/src/policydb_validate.c b/libsepol/src/policydb_validate.c
|
|
index 09f0813..9553812 100644
|
|
--- a/libsepol/src/policydb_validate.c
|
|
+++ b/libsepol/src/policydb_validate.c
|
|
@@ -2,6 +2,7 @@
|
|
#include <sepol/policydb/conditional.h>
|
|
#include <sepol/policydb/ebitmap.h>
|
|
#include <sepol/policydb/policydb.h>
|
|
+#include <sepol/policydb/polcaps.h>
|
|
#include <sepol/policydb/services.h>
|
|
|
|
#include "debug.h"
|
|
@@ -771,6 +772,23 @@ bad:
|
|
return -1;
|
|
}
|
|
|
|
+static int validate_policycaps(sepol_handle_t *handle, const policydb_t *p)
|
|
+{
|
|
+ ebitmap_node_t *node;
|
|
+ uint32_t i;
|
|
+
|
|
+ ebitmap_for_each_positive_bit(&p->policycaps, node, i) {
|
|
+ if (!sepol_polcap_getname(i))
|
|
+ goto bad;
|
|
+ }
|
|
+
|
|
+ return 0;
|
|
+
|
|
+bad:
|
|
+ ERR(handle, "Invalid policy capability");
|
|
+ return -1;
|
|
+}
|
|
+
|
|
static void validate_array_destroy(validate_t flavors[])
|
|
{
|
|
unsigned int i;
|
|
@@ -790,6 +808,9 @@ int policydb_validate(sepol_handle_t *handle, policydb_t *p)
|
|
if (validate_properties(handle, p))
|
|
goto bad;
|
|
|
|
+ if (validate_policycaps(handle, p))
|
|
+ goto bad;
|
|
+
|
|
if (p->policy_type == POLICY_KERN) {
|
|
if (validate_avtab(handle, &p->te_avtab, p, flavors))
|
|
goto bad;
|
|
--
|
|
2.33.0
|