summaryrefslogtreecommitdiffstats
path: root/recipes-security/selinux/libsepol/CVE-2021-36084.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-security/selinux/libsepol/CVE-2021-36084.patch')
-rw-r--r--recipes-security/selinux/libsepol/CVE-2021-36084.patch99
1 files changed, 0 insertions, 99 deletions
diff --git a/recipes-security/selinux/libsepol/CVE-2021-36084.patch b/recipes-security/selinux/libsepol/CVE-2021-36084.patch
deleted file mode 100644
index 1001563..0000000
--- a/recipes-security/selinux/libsepol/CVE-2021-36084.patch
+++ /dev/null
@@ -1,99 +0,0 @@
1From f34d3d30c8325e4847a6b696fe7a3936a8a361f3 Mon Sep 17 00:00:00 2001
2From: James Carter <jwcart2@gmail.com>
3Date: Thu, 8 Apr 2021 13:32:01 -0400
4Subject: [PATCH] libsepol/cil: Destroy classperms list when resetting
5 classpermission
6
7Nicolas Iooss reports:
8 A few months ago, OSS-Fuzz found a crash in the CIL compiler, which
9 got reported as
10 https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=28648 (the title
11 is misleading, or is caused by another issue that conflicts with the
12 one I report in this message). Here is a minimized CIL policy which
13 reproduces the issue:
14
15 (class CLASS (PERM))
16 (classorder (CLASS))
17 (sid SID)
18 (sidorder (SID))
19 (user USER)
20 (role ROLE)
21 (type TYPE)
22 (category CAT)
23 (categoryorder (CAT))
24 (sensitivity SENS)
25 (sensitivityorder (SENS))
26 (sensitivitycategory SENS (CAT))
27 (allow TYPE self (CLASS (PERM)))
28 (roletype ROLE TYPE)
29 (userrole USER ROLE)
30 (userlevel USER (SENS))
31 (userrange USER ((SENS)(SENS (CAT))))
32 (sidcontext SID (USER ROLE TYPE ((SENS)(SENS))))
33
34 (classpermission CLAPERM)
35
36 (optional OPT
37 (roletype nonexistingrole nonexistingtype)
38 (classpermissionset CLAPERM (CLASS (PERM)))
39 )
40
41 The CIL policy fuzzer (which mimics secilc built with clang Address
42 Sanitizer) reports:
43
44 ==36541==ERROR: AddressSanitizer: heap-use-after-free on address
45 0x603000004f98 at pc 0x56445134c842 bp 0x7ffe2a256590 sp
46 0x7ffe2a256588
47 READ of size 8 at 0x603000004f98 thread T0
48 #0 0x56445134c841 in __cil_verify_classperms
49 /selinux/libsepol/src/../cil/src/cil_verify.c:1620:8
50 #1 0x56445134a43e in __cil_verify_classpermission
51 /selinux/libsepol/src/../cil/src/cil_verify.c:1650:9
52 #2 0x56445134a43e in __cil_pre_verify_helper
53 /selinux/libsepol/src/../cil/src/cil_verify.c:1715:8
54 #3 0x5644513225ac in cil_tree_walk_core
55 /selinux/libsepol/src/../cil/src/cil_tree.c:272:9
56 #4 0x564451322ab1 in cil_tree_walk
57 /selinux/libsepol/src/../cil/src/cil_tree.c:316:7
58 #5 0x5644513226af in cil_tree_walk_core
59 /selinux/libsepol/src/../cil/src/cil_tree.c:284:9
60 #6 0x564451322ab1 in cil_tree_walk
61 /selinux/libsepol/src/../cil/src/cil_tree.c:316:7
62 #7 0x5644512b88fd in cil_pre_verify
63 /selinux/libsepol/src/../cil/src/cil_post.c:2510:7
64 #8 0x5644512b88fd in cil_post_process
65 /selinux/libsepol/src/../cil/src/cil_post.c:2524:7
66 #9 0x5644511856ff in cil_compile
67 /selinux/libsepol/src/../cil/src/cil.c:564:7
68
69The classperms list of a classpermission rule is created and filled
70in when classpermissionset rules are processed, so it doesn't own any
71part of the list and shouldn't retain any of it when it is reset.
72
73Destroy the classperms list (without destroying the data in it) when
74resetting a classpermission rule.
75
76Reported-by: Nicolas Iooss <nicolas.iooss@m4x.org>
77Signed-off-by: James Carter <jwcart2@gmail.com>
78
79Upstream-Status: Backport
80CVE: CVE-2021-36084
81Signed-off-by: Armin Kuster <akuster@mvista.com>
82
83---
84 libsepol/cil/src/cil_reset_ast.c | 2 +-
85 1 file changed, 1 insertion(+), 1 deletion(-)
86
87Index: libsepol-3.0/cil/src/cil_reset_ast.c
88===================================================================
89--- libsepol-3.0.orig/cil/src/cil_reset_ast.c
90+++ libsepol-3.0/cil/src/cil_reset_ast.c
91@@ -52,7 +52,7 @@ static void cil_reset_classpermission(st
92 return;
93 }
94
95- cil_reset_classperms_list(cp->classperms);
96+ cil_list_destroy(&cp->classperms, CIL_FALSE);
97 }
98
99 static void cil_reset_classperms_set(struct cil_classperms_set *cp_set)