From: Khem Raj <raj.khem@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Khem Raj <raj.khem@gmail.com>, Khem Raj <khem.raj@oss.qualcomm.com>
Subject: [PATCH 6/7] re2c: upgrade 4.4 -> 4.5.1
Date: Wed, 15 Apr 2026 22:54:06 -0700 [thread overview]
Message-ID: <20260416055407.795016-6-khem.raj@oss.qualcomm.com> (raw)
In-Reply-To: <20260416055407.795016-1-khem.raj@oss.qualcomm.com>
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <khem.raj@oss.qualcomm.com>
---
.../re2c/re2c/CVE-2026-2903.patch | 68 -------------------
.../re2c/{re2c_4.4.bb => re2c_4.5.1.bb} | 5 +-
2 files changed, 2 insertions(+), 71 deletions(-)
delete mode 100644 meta/recipes-support/re2c/re2c/CVE-2026-2903.patch
rename meta/recipes-support/re2c/{re2c_4.4.bb => re2c_4.5.1.bb} (86%)
diff --git a/meta/recipes-support/re2c/re2c/CVE-2026-2903.patch b/meta/recipes-support/re2c/re2c/CVE-2026-2903.patch
deleted file mode 100644
index 266891fa49..0000000000
--- a/meta/recipes-support/re2c/re2c/CVE-2026-2903.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From febeb977936f9519a25d9fbd10ff8256358cdb97 Mon Sep 17 00:00:00 2001
-From: Ulya Trofimovich <skvadrik@gmail.com>
-Date: Tue, 3 Feb 2026 21:33:11 +0000
-Subject: [PATCH] Fix null pointer dereference when actions are used without
- rules.
-
-Null pointer dereference happened because the root TNFA state was null:
-there were no rules for a block, but determinization still happened.
-
-In this case re2c should emit an error and never even attempt
-determinization. It was properly handled for blocks with start
-conditions, but not for normal blocks.
-
-This addresses #571 "[Bug] Segmentation Fault (NULL Dereference) in
-re2c::closure_leftmost_dfs during determinization".
-
-CVE: CVE-2026-2903
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@arm.com>
----
- src/parse/ast.cc | 19 +++++++++++++++----
- test/conditions/cond_error_10.c | 2 +-
- 2 files changed, 16 insertions(+), 5 deletions(-)
-
-diff --git a/src/parse/ast.cc b/src/parse/ast.cc
-index 91865e801..986cfb7da 100644
---- a/src/parse/ast.cc
-+++ b/src/parse/ast.cc
-@@ -332,10 +332,6 @@ Ret check_and_merge_special_rules(AstGrams& grams, const opt_t* opts, Msg& msg,
- all_conds_have_it = false; \
- } else if (g.name == STAR_COND) { \
- star_action = g.action[0]; \
-- } else if (g.rules.empty()) { \
-- RET_FAIL(msg.error(g.action[0]->loc, \
-- "%s action for non-existing condition `%s` found", \
-- str, g.name.c_str())); \
- } \
- } \
- if (star_action && all_conds_have_it) { \
-@@ -422,6 +418,21 @@ Ret check_and_merge_special_rules(AstGrams& grams, const opt_t* opts, Msg& msg,
- }
- }
-
-+ for (const AstGram& g : grams) {
-+ if (g.rules.empty()) {
-+#define CHECK_ACTION(action, str) do { \
-+ if (!g.action.empty()) { \
-+ RET_FAIL(msg.error(g.action[0]->loc, \
-+ "%s action %sbut no rules found", str, incond(g.name).c_str())); \
-+ } \
-+} while(0)
-+ CHECK_ACTION(entry, "entry");
-+ CHECK_ACTION(pre_rule, "pre-rule");
-+ CHECK_ACTION(post_rule, "post-rule");
-+#undef CHECK_ACTION
-+ }
-+ }
-+
- // zero condition must be the first one.
- auto zero = std::find_if(
- grams.begin(), grams.end(), [](const AstGram& g) { return g.name == ZERO_COND; });
-diff --git a/test/conditions/cond_error_10.c b/test/conditions/cond_error_10.c
-index 571028a22..3bfde301b 100644
---- a/test/conditions/cond_error_10.c
-+++ b/test/conditions/cond_error_10.c
-@@ -1 +1 @@
--conditions/cond_error_10.re:7:5: error: pre-rule action for non-existing condition `c` found
-+conditions/cond_error_10.re:7:5: error: pre-rule action in condition 'c' but no rules found
diff --git a/meta/recipes-support/re2c/re2c_4.4.bb b/meta/recipes-support/re2c/re2c_4.5.1.bb
similarity index 86%
rename from meta/recipes-support/re2c/re2c_4.4.bb
rename to meta/recipes-support/re2c/re2c_4.5.1.bb
index ea9364c483..ee3774017f 100644
--- a/meta/recipes-support/re2c/re2c_4.4.bb
+++ b/meta/recipes-support/re2c/re2c_4.5.1.bb
@@ -6,10 +6,9 @@ SECTION = "devel"
LICENSE = "PD"
LIC_FILES_CHKSUM = "file://LICENSE;md5=64eca4d8a3b67f9dc7656094731a2c8d"
-SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz \
- file://CVE-2026-2903.patch"
+SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz"
-SRC_URI[sha256sum] = "6b6b865924447ef992d5db4e52fb9307e5f65f26edd43efa91395da810f4280a"
+SRC_URI[sha256sum] = "ffea067c11aa668bcb42885be6e6cd000302000b7747d2bb213299ec66b7864e"
GITHUB_BASE_URI = "https://github.com/skvadrik/re2c/releases"
BBCLASSEXTEND = "native nativesdk"
next prev parent reply other threads:[~2026-04-16 5:54 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-04-16 5:54 [PATCH 1/7] gn: upgrade to latest revision Khem Raj
2026-04-16 5:54 ` [PATCH 2/7] dos2unix: upgrade 7.5.4 -> 7.5.5 Khem Raj
2026-04-16 5:54 ` [PATCH 3/7] python3-pdm-backend: upgrade 2.4.7 -> 2.4.8 Khem Raj
2026-04-16 5:54 ` [PATCH 4/7] python3-pdm: upgrade 2.26.6 -> 2.26.7 Khem Raj
2026-04-16 5:54 ` [PATCH 5/7] python3-lxml: upgrade 6.0.2 -> 6.0.4 Khem Raj
2026-04-16 5:54 ` Khem Raj [this message]
2026-04-16 5:54 ` [PATCH 7/7] libmpc: Upgrade to 1.4.0 Khem Raj
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=20260416055407.795016-6-khem.raj@oss.qualcomm.com \
--to=raj.khem@gmail.com \
--cc=khem.raj@oss.qualcomm.com \
--cc=openembedded-core@lists.openembedded.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