From: Wander Lairson Costa <wander@redhat.com>
To: Steven Rostedt <rostedt@goodmis.org>,
Gabriele Monaco <gmonaco@redhat.com>,
Nam Cao <namcao@linutronix.de>,
Wander Lairson Costa <wander@redhat.com>,
linux-trace-kernel@vger.kernel.org (open list:RUNTIME
VERIFICATION (RV)), linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v2 09/20] rv/rvgen: fix DOT file validation logic error
Date: Wed, 4 Feb 2026 11:42:35 -0300 [thread overview]
Message-ID: <20260204144914.104028-10-wander@redhat.com> (raw)
In-Reply-To: <20260204144914.104028-1-wander@redhat.com>
Fix incorrect boolean logic in automata DOT file format validation
that allowed malformed files to pass undetected. The previous
implementation used a logical AND operator where OR was required,
causing the validation to only reject files when both the first
token was not "digraph" AND the second token was not
"state_automaton". This meant a file starting with "digraph" but
having an incorrect second token would incorrectly pass validation.
The corrected logic properly rejects DOT files where either the
first token is not "digraph" or the second token is not
"state_automaton", ensuring that only properly formatted automaton
definition files are accepted for processing. Without this fix,
invalid DOT files could cause downstream parsing failures or
generate incorrect C code for runtime verification monitors.
Signed-off-by: Wander Lairson Costa <wander@redhat.com>
Reviewed-by: Nam Cao <namcao@linutronix.de>
Reviewed-by: Gabriele Monaco <gmonaco@redhat.com>
---
tools/verification/rvgen/rvgen/automata.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/verification/rvgen/rvgen/automata.py b/tools/verification/rvgen/rvgen/automata.py
index deb1f09556c3c..38035d59cdd51 100644
--- a/tools/verification/rvgen/rvgen/automata.py
+++ b/tools/verification/rvgen/rvgen/automata.py
@@ -59,7 +59,7 @@ class Automata:
# checking the first line:
line = dot_lines[cursor].split()
- if (line[0] != "digraph") and (line[1] != "state_automaton"):
+ if (line[0] != "digraph") or (line[1] != "state_automaton"):
raise AutomataError(f"Not a valid .dot format: {self.__dot_path}")
else:
cursor += 1
--
2.52.0
next prev parent reply other threads:[~2026-02-04 14:52 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-02-04 14:42 [PATCH v2 00/20] rv/rvgen: Robustness, modernization, and fixes Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 01/20] rv/rvgen: introduce AutomataError exception class Wander Lairson Costa
2026-02-05 6:50 ` Gabriele Monaco
2026-02-05 19:53 ` Wander Lairson Costa
2026-02-05 12:08 ` Gabriele Monaco
2026-02-05 19:51 ` Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 02/20] rv/rvgen: remove bare except clauses in generator Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 03/20] rv/rvgen: replace % string formatting with f-strings Wander Lairson Costa
2026-02-05 11:37 ` Gabriele Monaco
2026-02-05 19:54 ` Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 04/20] rv/rvgen: replace __len__() calls with len() Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 05/20] rv/rvgen: remove unnecessary semicolons Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 06/20] rv/rvgen: use context managers for file operations Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 07/20] rv/rvgen: fix typos in automata and generator docstring and comments Wander Lairson Costa
2026-02-05 7:03 ` Gabriele Monaco
2026-02-05 20:04 ` Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 08/20] rv/rvgen: fix PEP 8 whitespace violations Wander Lairson Costa
2026-02-04 14:42 ` Wander Lairson Costa [this message]
2026-02-04 14:42 ` [PATCH v2 10/20] rv/rvgen: use class constant for init marker Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 11/20] rv/rvgen: refactor automata.py to use iterator-based parsing Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 12/20] rv/rvgen: remove unused sys import from dot2c Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 13/20] rv/rvgen: remove unused __get_main_name method Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 14/20] rv/rvgen: make monitor arguments required in rvgen Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 15/20] rv/rvgen: fix isinstance check in Variable.expand() Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 16/20] rv/rvgen: extract node marker string to class constant Wander Lairson Costa
2026-02-05 11:47 ` Gabriele Monaco
2026-02-04 14:42 ` [PATCH v2 17/20] rv/rvgen: enforce presence of initial state Wander Lairson Costa
2026-02-05 11:44 ` Gabriele Monaco
2026-02-04 14:42 ` [PATCH v2 18/20] rv/rvgen: fix unbound loop variable warning Wander Lairson Costa
2026-02-05 11:38 ` Gabriele Monaco
2026-02-04 14:42 ` [PATCH v2 19/20] rv/rvgen: fix _fill_states() return type annotation Wander Lairson Costa
2026-02-05 7:24 ` Gabriele Monaco
2026-02-05 20:03 ` Wander Lairson Costa
2026-02-04 14:42 ` [PATCH v2 20/20] rv/rvgen: add missing return type annotations Wander Lairson Costa
2026-02-05 7:24 ` Gabriele Monaco
2026-02-05 20:12 ` Wander Lairson Costa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260204144914.104028-10-wander@redhat.com \
--to=wander@redhat.com \
--cc=gmonaco@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-trace-kernel@vger.kernel.org \
--cc=namcao@linutronix.de \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox