From 22b908e76f17851dac5f49dd4394068147c0b567 Mon Sep 17 00:00:00 2001 From: Petr Lautrbach Date: Mon, 26 Aug 2024 22:18:35 +0200 Subject: [PATCH] sepolgen-ifgen: allow M4 escaped filenames When a file name in type transition rule used in an interface is same as a keyword, it needs to be M4 escaped so that the keyword is not expanded by M3, e.g. - filetrans_pattern($1, virt_var_run_t, virtinterfaced_var_run_t, dir, "interface") + filetrans_pattern($1, virt_var_run_t, virtinterfaced_var_run_t, dir, ``"interface"'') But sepolgen-ifgen could not parse such string: # sepolgen-ifgen Illegal character '`' This change allows M4 escaping inside quoted strings and fixed described problem. https://bugzilla.redhat.com/show_bug.cgi?id=2254206 Signed-off-by: Petr Lautrbach --- python/sepolgen/src/sepolgen/refparser.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/python/sepolgen/src/sepolgen/refparser.py b/python/sepolgen/src/sepolgen/refparser.py index e261d3f78..41e0d52c8 100644 --- a/python/sepolgen/src/sepolgen/refparser.py +++ b/python/sepolgen/src/sepolgen/refparser.py @@ -486,7 +486,7 @@ def p_interface_call_param(p): | nested_id_set | TRUE | FALSE - | FILENAME + | quoted_filename ''' # Intentionally let single identifiers pass through # List means set, non-list identifier @@ -497,6 +497,12 @@ def p_interface_call_param(p): else: p[0] = [p[1], "-" + p[3]] +def p_quoted_filename(p): + '''quoted_filename : TICK quoted_filename SQUOTE + | FILENAME + ''' + p[0] = p[1] + def p_interface_call_param_list(p): '''interface_call_param_list : interface_call_param | interface_call_param_list COMMA interface_call_param