libsepol: do not add gaps to string list
PATCH 1/1 libsepol: do not add gaps to string list
When converting an ebitmap into a string list, skip potential gaps in ebitmap_to_strs(). All converting functions like strs_to_str(), strs_write_each() and strs_write_each_indented() do already skip NULL elements, but sorting such a list will lead to a NULL dereference.
#0 0x432ce5 in strcmp /src/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:462:25
#1 0x4f4893 in strs_cmp selinux/libsepol/src/kernel_to_common.c:258:9
#2 0x47b74b in qsort_r /src/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:9994:7
#3 0x4f481d in strs_sort selinux/libsepol/src/kernel_to_common.c:266:2
#4 0x4fe781 in attrmap_to_str selinux/libsepol/src/kernel_to_conf.c:1560:2
#5 0x4fe781 in write_type_attribute_sets_to_conf selinux/libsepol/src/kernel_to_conf.c:1599:11
#6 0x4f8098 in sepol_kernel_policydb_to_conf selinux/libsepol/src/kernel_to_conf.c:3182:7
#7 0x4e0277 in LLVMFuzzerTestOneInput selinux/libsepol/fuzz/binpolicy-fuzzer.c:50:9
#8 0x4d613b in main
#9 0x7fa2d50260b2 in __libc_start_main /build/glibc-eX1tMB/glibc-2.31/csu/libc-start.c:308:16
#10 0x41d4ed in _startFound by oss-fuzz (#44170)
--- libsepol/src/kernel_to_common.c | 3 +++ 1 file changed, 3 insertions(+)
libsepol/src/kernel_to_common.c +3 -0
@@ -366,6 +366,9 @@ int ebitmap_to_strs(struct ebitmap *map, struct strs *strs, char **val_to_name)int rc;ebitmap_for_each_positive_bit (map, node, i) { +if (!val_to_name[i]) +continue ; + rc =strs_add (strs, val_to_name[i]);if (rc !=0 ) {return -1 ;
Signature · 1 line
2.34.1
Quoted 18 lines · Christian Göttsche
When converting an ebitmap into a string list, skip potential gaps in
ebitmap_to_strs(). All converting functions likestrs_to_str(),strs_write_each()andstrs_write_each_indented()do already skip NULL elements, but sorting such a list will lead to a NULL dereference.#0 0x432ce5 in strcmp /src/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:462:25 #1 0x4f4893 in strs_cmp selinux/libsepol/src/kernel_to_common.c:258:9 #2 0x47b74b in qsort_r /src/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:9994:7 #3 0x4f481d in strs_sort selinux/libsepol/src/kernel_to_common.c:266:2 #4 0x4fe781 in attrmap_to_str selinux/libsepol/src/kernel_to_conf.c:1560:2 #5 0x4fe781 in write_type_attribute_sets_to_conf selinux/libsepol/src/kernel_to_conf.c:1599:11 #6 0x4f8098 in sepol_kernel_policydb_to_conf selinux/libsepol/src/kernel_to_conf.c:3182:7 #7 0x4e0277 in LLVMFuzzerTestOneInput selinux/libsepol/fuzz/binpolicy-fuzzer.c:50:9 #8 0x4d613b in main #9 0x7fa2d50260b2 in __libc_start_main /build/glibc-eX1tMB/glibc-2.31/csu/libc-start.c:308:16 #10 0x41d4ed in _start
Quoted 3 lines
Found by oss-fuzz (#44170)
Signed-off-by Christian Göttsche <[email protected]>
Quoted 21 lines
--- libsepol/src/kernel_to_common.c | 3 +++ 1 file changed, 3 insertions(+)libsepol/src/kernel_to_common.c +3
-1@@ -366,6 +366,9 @@ int ebitmap_to_strs(struct ebitmap *map, struct strs *strs, char **val_to_name)int rc;ebitmap_for_each_positive_bit (map, node, i) { +if (!val_to_name[i]) +continue ; + rc =strs_add (strs, val_to_name[i]);if (rc !=0 ) {return -1 ; --2.34.1
Quoted 21 lines · James Carter
Quoted 18 lines · Christian Göttsche
When converting an ebitmap into a string list, skip potential gaps in
ebitmap_to_strs(). All converting functions likestrs_to_str(),strs_write_each()andstrs_write_each_indented()do already skip NULL elements, but sorting such a list will lead to a NULL dereference.#0 0x432ce5 in strcmp /src/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:462:25 #1 0x4f4893 in strs_cmp selinux/libsepol/src/kernel_to_common.c:258:9 #2 0x47b74b in qsort_r /src/llvm-project/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc:9994:7 #3 0x4f481d in strs_sort selinux/libsepol/src/kernel_to_common.c:266:2 #4 0x4fe781 in attrmap_to_str selinux/libsepol/src/kernel_to_conf.c:1560:2 #5 0x4fe781 in write_type_attribute_sets_to_conf selinux/libsepol/src/kernel_to_conf.c:1599:11 #6 0x4f8098 in sepol_kernel_policydb_to_conf selinux/libsepol/src/kernel_to_conf.c:3182:7 #7 0x4e0277 in LLVMFuzzerTestOneInput selinux/libsepol/fuzz/binpolicy-fuzzer.c:50:9 #8 0x4d613b in main #9 0x7fa2d50260b2 in __libc_start_main /build/glibc-eX1tMB/glibc-2.31/csu/libc-start.c:308:16 #10 0x41d4ed in _start
Quoted 6 lines
Quoted 3 lines
Found by oss-fuzz (#44170)
Signed-off-by Christian Göttsche <[email protected]>Acked-by James Carter <[email protected]>
Merged.
Thanks,
Jim
Quoted 21 lines
Quoted 21 lines
--- libsepol/src/kernel_to_common.c | 3 +++ 1 file changed, 3 insertions(+)libsepol/src/kernel_to_common.c +3
-1@@ -366,6 +366,9 @@ int ebitmap_to_strs(struct ebitmap *map, struct strs *strs, char **val_to_name)int rc;ebitmap_for_each_positive_bit (map, node, i) { +if (!val_to_name[i]) +continue ; + rc =strs_add (strs, val_to_name[i]);if (rc !=0 ) {return -1 ; --2.34.1