mirror of
https://gitlab.com/buildroot.org/buildroot.git
synced 2026-08-01 21:23:51 -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>
26 lines
1.1 KiB
Diff
26 lines
1.1 KiB
Diff
From: Mark Adler <madler@alumni.caltech.edu>
|
|
Subject: Fix bug in undefer_input() that misplaced the input state.
|
|
Origin: https://github.com/madler/unzip/commit/41beb477c5744bc396fa1162ee0c14218ec12213
|
|
Bug-Debian: https://bugs.debian.org/931433
|
|
X-Debian-version: 6.0-24
|
|
|
|
Fix bug in undefer_input() that misplaced the input state.
|
|
|
|
CVE: CVE-2019-13232
|
|
Upstream: https://sources.debian.org/src/unzip/6.0-29/debian/patches/22-cve-2019-13232-fix-bug-in-undefer-input.patch
|
|
Signed-off-by: Thomas Perale <thomas.perale@mind.be>
|
|
--- a/fileio.c
|
|
+++ b/fileio.c
|
|
@@ -532,8 +532,10 @@
|
|
* This condition was checked when G.incnt_leftover was set > 0 in
|
|
* defer_leftover_input(), and it is NOT allowed to touch G.csize
|
|
* before calling undefer_input() when (G.incnt_leftover > 0)
|
|
- * (single exception: see read_byte()'s "G.csize <= 0" handling) !!
|
|
+ * (single exception: see readbyte()'s "G.csize <= 0" handling) !!
|
|
*/
|
|
+ if (G.csize < 0L)
|
|
+ G.csize = 0L;
|
|
G.incnt = G.incnt_leftover + (int)G.csize;
|
|
G.inptr = G.inptr_leftover - (int)G.csize;
|
|
G.incnt_leftover = 0;
|