From 168e5848addda21067d3b8791e9b781847daa30f Mon Sep 17 00:00:00 2001 From: Charles Hardin Date: Tue, 20 Jun 2023 10:23:05 -0700 Subject: [PATCH] package/unzip: configure with LARGE_FILE_SUPPORT by default Buildroot always enable largefile support in the toolchain, and thus the associated definitions are always on. This leads to a problem in 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 define not being set 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) The simple solution is just enable LARGE_FILE_SUPPORT to enable large file support. In order to avoid redefinition warnings, we undefine _LARGEFILE_SOURCE and _LARGEFILE64_SOURCE. Signed-off-by: Charles Hardin Tested-by: Luca Ceresoli Signed-off-by: Thomas Petazzoni --- 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))