libsepol: fix invalid read when policy file is corrupt
PATCH 1/1 libsepol: fix invalid read when policy file is corrupt
From: William Roberts <[email protected]>
AFL Found this bug:
==6523== Invalid read of size 8
==6523== at 0x4166B4: type_set_expand (expand.c:2508) ==6523== by 0x43A0B8: policydb_role_cache (policydb.c:790) ==6523== by 0x41CD70: hashtab_map (hashtab.c:235) ==6523== by 0x43AC9E: policydb_index_others (policydb.c:1103) ==6523== by 0x441B14: policydb_read (policydb.c:3888) ==6523== by 0x442A1F: sepol_policydb_read (policydb_public.c:174) ==6523== by 0x407ED4: init (check_seapp.c:885) ==6523== by 0x408D97: main (check_seapp.c:1231)
This occurs when the type_val_to_struct[] mapping array doesn't contain the type indicated in the ebitmap.
Signed-off-by William Roberts <[email protected]>
--- libsepol/src/expand.c | 8 ++++++++ 1 file changed, 8 insertions(+)
libsepol/src/expand.c +8 -0
@@ -2505,6 +2505,14 @@ int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,/* First go through the types and OR all the attributes to types */ ebitmap_for_each_bit (&set->types, tnode, i) {if (ebitmap_node_get_bit (tnode, i)) { + +/* +* invalid policies might have more types set in the ebitmap than +* what's available in the type_val_to_struct mapping +*/ +if (i > p->p_types.nprim -1 ) +return -1 ; +if (p->type_val_to_struct[i]->flavor ==TYPE_ATTRIB ) { if (ebitmap_union
Signature · 1 line
1.9.1
James Carter
AppliedQuoted 13 lines · On 08/08/2016 12:44 PM, [email protected] wrote:
From: William Roberts <[email protected]>
AFL Found this bug:
==6523== Invalid read of size 8==6523== at 0x4166B4: type_set_expand (expand.c:2508) ==6523== by 0x43A0B8: policydb_role_cache (policydb.c:790) ==6523== by 0x41CD70: hashtab_map (hashtab.c:235) ==6523== by 0x43AC9E: policydb_index_others (policydb.c:1103) ==6523== by 0x441B14: policydb_read (policydb.c:3888) ==6523== by 0x442A1F: sepol_policydb_read (policydb_public.c:174) ==6523== by 0x407ED4: init (check_seapp.c:885) ==6523== by 0x408D97: main (check_seapp.c:1231)
Quoted 4 lines
This occurs when the type_val_to_struct[] mapping array doesn't contain the type indicated in the ebitmap.
Signed-off-by William Roberts <[email protected]>
Applied.
Thanks,
Jim
Quoted 24 lines
--- libsepol/src/expand.c | 8 ++++++++ 1 file changed, 8 insertions(+)libsepol/src/expand.c +8
-0@@ -2505,6 +2505,14 @@ int type_set_expand(type_set_t * set, ebitmap_t * t, policydb_t * p,/* First go through the types and OR all the attributes to types */ ebitmap_for_each_bit (&set->types, tnode, i) {if (ebitmap_node_get_bit (tnode, i)) { + +/* +* invalid policies might have more types set in the ebitmap than +* what's available in the type_val_to_struct mapping +*/ +if (i > p->p_types.nprim -1 ) +return -1 ; +if (p->type_val_to_struct[i]->flavor ==TYPE_ATTRIB ) { if (ebitmap_union
Signature · 2 lines
James Carter <[email protected]> National Security Agency