From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 06 Feb 2026 09:56:41 +0100 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1voHdq-009QUS-0l for lore@lore.pengutronix.de; Fri, 06 Feb 2026 09:56:41 +0100 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1voHdp-0008DK-IL; Fri, 06 Feb 2026 09:56:41 +0100 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1voHdR-0007bk-7r; Fri, 06 Feb 2026 09:56:17 +0100 Received: from dude05.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::54]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1voHdR-004NMk-2J; Fri, 06 Feb 2026 09:56:17 +0100 Received: from mol by dude05.red.stw.pengutronix.de with local (Exim 4.98.2) (envelope-from ) id 1voHdQ-00000000NbH-49ZJ; Fri, 06 Feb 2026 09:56:16 +0100 From: Michael Olbrich To: ptxdist@pengutronix.de Date: Fri, 6 Feb 2026 09:56:16 +0100 Message-ID: <20260206085616.90712-1-m.olbrich@pengutronix.de> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260201122711.2350573-1-christian.melki@t2data.com> References: <20260201122711.2350573-1-christian.melki@t2data.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: Re: [ptxdist] [APPLIED] dtc: Apply upstream patch for build errors. X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Christian Melki Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false Thanks, applied as cd95ea4ea169b2e888287332f8756cd5dbb281fe. Michael [sent from post-receive hook] On Fri, 06 Feb 2026 09:56:16 +0100, Christian Melki wrote: > On some setups, these cause build errors. > Fixed upstream. Apply now, probably remove in next stable release. > > Signed-off-by: Christian Melki > Message-Id: <20260201122711.2350573-1-christian.melki@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/dtc-1.7.2/0001-Fix-discarded-const-qualifiers.patch b/patches/dtc-1.7.2/0001-Fix-discarded-const-qualifiers.patch > new file mode 100644 > index 000000000000..766dbccc2427 > --- /dev/null > +++ b/patches/dtc-1.7.2/0001-Fix-discarded-const-qualifiers.patch > @@ -0,0 +1,80 @@ > +From: Stephen Gallagher > +Date: Tue, 6 Jan 2026 14:19:30 -0500 > +Subject: [PATCH] Fix discarded const qualifiers > + > +It's unsafe to implicitly discard the const qualifier on a pointer. In > +overlay_fixup_phandle(), this was probably just an oversight, and making > +the "sep" variable a const char * is sufficient to fix it. > + > +In create_node(), however, the "p" variable is directly modifying the > +buffer pointed to by "const char* node_name". To fix this, we need to > +actually make a duplicate of the buffer and operate on that instead. > + > +This introduces a malloc()/free() and an unbounded strdup() into the > +operation, but fdtput isn't a long-running service and the node_name > +argument comes directly from argv, so this shouldn't introduce a > +significant performance impact. > + > +Signed-off-by: Stephen Gallagher > +Signed-off-by: David Gibson > +--- > + fdtput.c | 8 +++++--- > + libfdt/fdt_overlay.c | 3 ++- > + meson.build | 1 + > + 3 files changed, 8 insertions(+), 4 deletions(-) > + > +diff --git a/fdtput.c b/fdtput.c > +index c2fecf45a977..8deec7eebcf5 100644 > +--- a/fdtput.c > ++++ b/fdtput.c > +@@ -230,19 +230,21 @@ static int create_paths(char **blob, const char *in_path) > + static int create_node(char **blob, const char *node_name) > + { > + int node = 0; > +- char *p; > ++ const char *p; > ++ char *path = NULL; > + > + p = strrchr(node_name, '/'); > + if (!p) { > + report_error(node_name, -1, -FDT_ERR_BADPATH); > + return -1; > + } > +- *p = '\0'; > + > + *blob = realloc_node(*blob, p + 1); > + > + if (p > node_name) { > +- node = fdt_path_offset(*blob, node_name); > ++ path = xstrndup(node_name, (size_t)(p - node_name)); > ++ node = fdt_path_offset(*blob, path); > ++ free(path); > + if (node < 0) { > + report_error(node_name, -1, node); > + return -1; > +diff --git a/libfdt/fdt_overlay.c b/libfdt/fdt_overlay.c > +index 28b667ffc490..5f8aa62b2686 100644 > +--- a/libfdt/fdt_overlay.c > ++++ b/libfdt/fdt_overlay.c > +@@ -409,7 +409,8 @@ static int overlay_fixup_phandle(void *fdt, void *fdto, int symbols_off, > + const char *fixup_str = value; > + uint32_t path_len, name_len; > + uint32_t fixup_len; > +- char *sep, *endptr; > ++ const char *sep; > ++ char *endptr; > + int poffset, ret; > + > + fixup_end = memchr(value, '\0', len); > +diff --git a/meson.build b/meson.build > +index 310699f0c874..2966b0614a69 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -18,6 +18,7 @@ add_project_arguments( > + '-Wshadow', > + '-Wsuggest-attribute=format', > + '-Wwrite-strings', > ++ '-Wdiscarded-qualifiers', > + ]), > + language: 'c' > + ) > diff --git a/patches/dtc-1.7.2/series b/patches/dtc-1.7.2/series > new file mode 100644 > index 000000000000..d6c2782c41ab > --- /dev/null > +++ b/patches/dtc-1.7.2/series > @@ -0,0 +1,4 @@ > +# generated by git-ptx-patches > +#tag:base --start-number 1 > +0001-Fix-discarded-const-qualifiers.patch > +# 3a8b95763e3400e890427bab311c296a - git-ptx-patches magic