mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-09-28 21:11:41 -09:00
fb8958e3dc
In Buildroot there are multiple way to apply patches on a package [1]
- Adding `.patch` file in the package directory.
- Define `<pkg>_PATCH` variable with the location of the patch tar.gz.
It used to download Debian patches tarball.
- Implement custom patching logic with `PRE`/`POST` patches hooks.
To make the CycloneDX SBOM generation not dependant on downloading the
packages, the two last options have the downside of not appearing on the
generated SBOM.
The unzip package is downloading a tarball from the Debian mirror with
the `<pkg>_PATCH` method [2].
To improve the tracking of the patched vulnerabilities for the unzip
package this commit import the patches previously downloaded with the
`_PATCH` variable in the Buildroot tree.
This allows to add the `CVE:` trailer [3] on the patches that fix
vulnerabilities to better track which patch is fixing the vulnerability.
[1] https://buildroot.org/downloads/manual/manual.html#patch-policy
[2] https://snapshot.debian.org/archive/debian/20250311T215724Z/pool/main/u/unzip/unzip_6.0-29.debian.tar.xz
[3] 1167d0ff3d docs/manual: mention CVE trailer
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
31 lines
1.4 KiB
Diff
31 lines
1.4 KiB
Diff
From: "Steven M. Schweda" <sms@antinode.info>
|
|
Subject: Fix CVE-2014-8140: out-of-bounds write issue in test_compr_eb()
|
|
Bug-Debian: https://bugs.debian.org/773722
|
|
CVE: CVE-2014-8140
|
|
Upstream: https://sources.debian.org/src/unzip/6.0-29/debian/patches/10-cve-2014-8140-test-compr-eb.patch
|
|
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
|
|
|
|
--- a/extract.c
|
|
+++ b/extract.c
|
|
@@ -2232,10 +2232,17 @@
|
|
if (compr_offset < 4) /* field is not compressed: */
|
|
return PK_OK; /* do nothing and signal OK */
|
|
|
|
+ /* Return no/bad-data error status if any problem is found:
|
|
+ * 1. eb_size is too small to hold the uncompressed size
|
|
+ * (eb_ucsize). (Else extract eb_ucsize.)
|
|
+ * 2. eb_ucsize is zero (invalid). 2014-12-04 SMS.
|
|
+ * 3. eb_ucsize is positive, but eb_size is too small to hold
|
|
+ * the compressed data header.
|
|
+ */
|
|
if ((eb_size < (EB_UCSIZE_P + 4)) ||
|
|
- ((eb_ucsize = makelong(eb+(EB_HEADSIZE+EB_UCSIZE_P))) > 0L &&
|
|
- eb_size <= (compr_offset + EB_CMPRHEADLEN)))
|
|
- return IZ_EF_TRUNC; /* no compressed data! */
|
|
+ ((eb_ucsize = makelong( eb+ (EB_HEADSIZE+ EB_UCSIZE_P))) == 0L) ||
|
|
+ ((eb_ucsize > 0L) && (eb_size <= (compr_offset + EB_CMPRHEADLEN))))
|
|
+ return IZ_EF_TRUNC; /* no/bad compressed data! */
|
|
|
|
if (
|
|
#ifdef INT_16BIT
|