From: Charles Hardin <ckhardin@gmail.com>
To: buildroot@buildroot.org
Cc: Charles Hardin <ckhardin@gmail.com>,
Luca Ceresoli <luca.ceresoli@bootlin.com>
Subject: [Buildroot] [PATCH 1/1] package/unzip: configure with LARGE_FILE_SUPPORT by default
Date: Tue, 20 Jun 2023 10:23:05 -0700 [thread overview]
Message-ID: <20230620172305.4176-1-ckhardin@gmail.com> (raw)
Buildroot always enable largefile support in the toolchains, and
thus the associated definitions are always on. This leads to a
problem in the unzip that on a 32-bit arch with these flags being
passed in
-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
But, the LARGE_FILE_SUPPORT not being defined will cause a size
mismatch on the comparison of the zipfiles.
$ unzip test.zip
Archive: test.zip
error: invalid zip file with overlapped components (possible zip bomb)
Simple solution is just enable LARGE_FILE_SUPPORT in cmake to get
an expected extraction.
Signed-off-by: Charles Hardin <ckhardin@gmail.com>
---
package/unzip/unzip.mk | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/package/unzip/unzip.mk b/package/unzip/unzip.mk
index 44cc2013fb..14ccedd48f 100644
--- a/package/unzip/unzip.mk
+++ b/package/unzip/unzip.mk
@@ -28,4 +28,18 @@ UNZIP_IGNORE_CVES = \
CVE-2022-0529 \
CVE-2022-0530
+# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when
+# necessary, redefining it on the command line causes some warnings.
+UNZIP_TARGET_CFLAGS = \
+ $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CFLAGS))
+
+# unzip already defines _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE when
+# necessary, redefining it on the command line causes some warnings.
+UNZIP_TARGET_CXXFLAGS = \
+ $(filter-out -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE,$(TARGET_CXXFLAGS))
+
+UNZIP_CONF_OPTS += \
+ -DCMAKE_C_FLAGS="$(UNZIP_TARGET_CFLAGS) -DLARGE_FILE_SUPPORT" \
+ -DCMAKE_CXX_FLAGS="$(UNZIP_TARGET_CXXFLAGS) -DLARGE_FILE_SUPPORT"
+
$(eval $(cmake-package))
--
2.39.2 (Apple Git-143)
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
next reply other threads:[~2023-06-20 17:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-20 17:23 Charles Hardin [this message]
2023-06-26 11:17 ` [Buildroot] [PATCH 1/1] package/unzip: configure with LARGE_FILE_SUPPORT by default Luca Ceresoli via buildroot
2023-07-10 20:01 ` Thomas Petazzoni via buildroot
2023-07-17 7:54 ` Luca Ceresoli via buildroot
2023-07-10 20:00 ` Thomas Petazzoni via buildroot
2023-08-25 12:56 ` Peter Korsgaard
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=20230620172305.4176-1-ckhardin@gmail.com \
--to=ckhardin@gmail.com \
--cc=buildroot@buildroot.org \
--cc=luca.ceresoli@bootlin.com \
/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