* [Buildroot] [PATCH 1/2] package/libzlib: fix CPE vendor id
@ 2022-08-29 15:45 Marcus Hoffmann
2022-08-29 15:45 ` [Buildroot] [PATCH 2/2] package/libzlib: backport security fix for CVE-2022-37434 Marcus Hoffmann
2022-09-18 7:43 ` [Buildroot] [PATCH 1/2] package/libzlib: fix CPE vendor id Peter Korsgaard
0 siblings, 2 replies; 5+ messages in thread
From: Marcus Hoffmann @ 2022-08-29 15:45 UTC (permalink / raw)
To: buildroot
Can be found in this CVE entry for example:
https://nvd.nist.gov/vuln/detail/CVE-2022-37434
Signed-off-by: Marcus Hoffmann <marcus.hoffmann@othermo.de>
---
package/libzlib/libzlib.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk
index 933732d6ba..431c48739a 100644
--- a/package/libzlib/libzlib.mk
+++ b/package/libzlib/libzlib.mk
@@ -11,7 +11,7 @@ LIBZLIB_LICENSE = Zlib
LIBZLIB_LICENSE_FILES = README
LIBZLIB_INSTALL_STAGING = YES
LIBZLIB_PROVIDES = zlib
-LIBZLIB_CPE_ID_VENDOR = gnu
+LIBZLIB_CPE_ID_VENDOR = zlib
LIBZLIB_CPE_ID_PRODUCT = zlib
# It is not possible to build only a shared version of zlib, so we build both
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 2/2] package/libzlib: backport security fix for CVE-2022-37434
2022-08-29 15:45 [Buildroot] [PATCH 1/2] package/libzlib: fix CPE vendor id Marcus Hoffmann
@ 2022-08-29 15:45 ` Marcus Hoffmann
2022-09-18 7:43 ` [Buildroot] [PATCH 1/2] package/libzlib: fix CPE vendor id Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Marcus Hoffmann @ 2022-08-29 15:45 UTC (permalink / raw)
To: buildroot
See: https://security-tracker.debian.org/tracker/CVE-2022-37434
Signed-off-by: Marcus Hoffmann <marcus.hoffmann@othermo.de>
---
package/libzlib/0002-fix-CVE-2022-37434.patch | 35 +++++++++++++++++++
.../0003-fix-CVE-2022-37434-regression.patch | 32 +++++++++++++++++
package/libzlib/libzlib.mk | 3 ++
3 files changed, 70 insertions(+)
create mode 100644 package/libzlib/0002-fix-CVE-2022-37434.patch
create mode 100644 package/libzlib/0003-fix-CVE-2022-37434-regression.patch
diff --git a/package/libzlib/0002-fix-CVE-2022-37434.patch b/package/libzlib/0002-fix-CVE-2022-37434.patch
new file mode 100644
index 0000000000..a61be48536
--- /dev/null
+++ b/package/libzlib/0002-fix-CVE-2022-37434.patch
@@ -0,0 +1,35 @@
+From eff308af425b67093bab25f80f1ae950166bece1 Mon Sep 17 00:00:00 2001
+From: Mark Adler <fork@madler.net>
+Date: Sat, 30 Jul 2022 15:51:11 -0700
+Subject: [PATCH] Fix a bug when getting a gzip header extra field with
+ inflate().
+
+If the extra field was larger than the space the user provided with
+inflateGetHeader(), and if multiple calls of inflate() delivered
+the extra header data, then there could be a buffer overflow of the
+provided space. This commit assures that provided space is not
+exceeded.
+
+Backported from: eff308af425b67093bab25f80f1ae950166bece1
+Signed-off-by: Marcus Hoffmann <marcus.hoffmann@othermo.de>
+---
+ inflate.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/inflate.c b/inflate.c
+index 7be8c6366..7a7289749 100644
+--- a/inflate.c
++++ b/inflate.c
+@@ -763,9 +763,10 @@ int flush;
+ copy = state->length;
+ if (copy > have) copy = have;
+ if (copy) {
++ len = state->head->extra_len - state->length;
+ if (state->head != Z_NULL &&
+- state->head->extra != Z_NULL) {
+- len = state->head->extra_len - state->length;
++ state->head->extra != Z_NULL &&
++ len < state->head->extra_max) {
+ zmemcpy(state->head->extra + len, next,
+ len + copy > state->head->extra_max ?
+ state->head->extra_max - len : copy);
diff --git a/package/libzlib/0003-fix-CVE-2022-37434-regression.patch b/package/libzlib/0003-fix-CVE-2022-37434-regression.patch
new file mode 100644
index 0000000000..46a58710d2
--- /dev/null
+++ b/package/libzlib/0003-fix-CVE-2022-37434-regression.patch
@@ -0,0 +1,32 @@
+From 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d Mon Sep 17 00:00:00 2001
+From: Mark Adler <fork@madler.net>
+Date: Mon, 8 Aug 2022 10:50:09 -0700
+Subject: [PATCH] Fix extra field processing bug that dereferences NULL
+ state->head.
+
+The recent commit to fix a gzip header extra field processing bug
+introduced the new bug fixed here.
+
+Backported from: 1eb7682f845ac9e9bf9ae35bbfb3bad5dacbd91d
+Signed-off-by: Marcus Hoffmann <marcus.hoffmann@othermo.de>
+---
+ inflate.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/inflate.c b/inflate.c
+index 7a7289749..2a3c4fe98 100644
+--- a/inflate.c
++++ b/inflate.c
+@@ -763,10 +763,10 @@ int flush;
+ copy = state->length;
+ if (copy > have) copy = have;
+ if (copy) {
+- len = state->head->extra_len - state->length;
+ if (state->head != Z_NULL &&
+ state->head->extra != Z_NULL &&
+- len < state->head->extra_max) {
++ (len = state->head->extra_len - state->length) <
++ state->head->extra_max) {
+ zmemcpy(state->head->extra + len, next,
+ len + copy > state->head->extra_max ?
+ state->head->extra_max - len : copy);
diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk
index 431c48739a..f75502326b 100644
--- a/package/libzlib/libzlib.mk
+++ b/package/libzlib/libzlib.mk
@@ -14,6 +14,9 @@ LIBZLIB_PROVIDES = zlib
LIBZLIB_CPE_ID_VENDOR = zlib
LIBZLIB_CPE_ID_PRODUCT = zlib
+# 0002-fix-CVE-2022-37434.patch
+LIBZLIB_IGNORE_CVES = CVE-2022-37434
+
# It is not possible to build only a shared version of zlib, so we build both
# shared and static, unless we only want the static libs, and we eventually
# selectively remove what we do not want
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [Buildroot] [PATCH 1/2] package/libzlib: fix CPE vendor id
2022-08-29 15:45 [Buildroot] [PATCH 1/2] package/libzlib: fix CPE vendor id Marcus Hoffmann
2022-08-29 15:45 ` [Buildroot] [PATCH 2/2] package/libzlib: backport security fix for CVE-2022-37434 Marcus Hoffmann
@ 2022-09-18 7:43 ` Peter Korsgaard
1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2022-09-18 7:43 UTC (permalink / raw)
To: Marcus Hoffmann; +Cc: buildroot
>>>>> "Marcus" == Marcus Hoffmann <marcus.hoffmann@othermo.de> writes:
> Can be found in this CVE entry for example:
> https://nvd.nist.gov/vuln/detail/CVE-2022-37434
> Signed-off-by: Marcus Hoffmann <marcus.hoffmann@othermo.de>
Committed to 2022.05.x and 2022.02.x, thanks.
--
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/2] package/libzlib: fix CPE vendor id
@ 2022-08-29 17:14 Marcus Hoffmann
2022-08-30 21:29 ` Arnout Vandecappelle
0 siblings, 1 reply; 5+ messages in thread
From: Marcus Hoffmann @ 2022-08-29 17:14 UTC (permalink / raw)
To: buildroot; +Cc: Davide Viti, Asaf Kahlon
Can be found in this CVE entry for example:
https://nvd.nist.gov/vuln/detail/CVE-2022-37434
Signed-off-by: Marcus Hoffmann <marcus.hoffmann@othermo.de>
---
package/libzlib/libzlib.mk | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk
index 933732d6ba..431c48739a 100644
--- a/package/libzlib/libzlib.mk
+++ b/package/libzlib/libzlib.mk
@@ -11,7 +11,7 @@ LIBZLIB_LICENSE = Zlib
LIBZLIB_LICENSE_FILES = README
LIBZLIB_INSTALL_STAGING = YES
LIBZLIB_PROVIDES = zlib
-LIBZLIB_CPE_ID_VENDOR = gnu
+LIBZLIB_CPE_ID_VENDOR = zlib
LIBZLIB_CPE_ID_PRODUCT = zlib
# It is not possible to build only a shared version of zlib, so we build both
--
2.25.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/libzlib: fix CPE vendor id
2022-08-29 17:14 Marcus Hoffmann
@ 2022-08-30 21:29 ` Arnout Vandecappelle
0 siblings, 0 replies; 5+ messages in thread
From: Arnout Vandecappelle @ 2022-08-30 21:29 UTC (permalink / raw)
To: Marcus Hoffmann, buildroot; +Cc: Davide Viti, Asaf Kahlon
On 29/08/2022 19:14, Marcus Hoffmann wrote:
> Can be found in this CVE entry for example:
> https://nvd.nist.gov/vuln/detail/CVE-2022-37434
>
> Signed-off-by: Marcus Hoffmann <marcus.hoffmann@othermo.de>
Applied both to master, thanks.
I extended the commit message with the URLs into the CPE database search for
the right and the wrong vendor.
Regards,
Arnout
> ---
> package/libzlib/libzlib.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/package/libzlib/libzlib.mk b/package/libzlib/libzlib.mk
> index 933732d6ba..431c48739a 100644
> --- a/package/libzlib/libzlib.mk
> +++ b/package/libzlib/libzlib.mk
> @@ -11,7 +11,7 @@ LIBZLIB_LICENSE = Zlib
> LIBZLIB_LICENSE_FILES = README
> LIBZLIB_INSTALL_STAGING = YES
> LIBZLIB_PROVIDES = zlib
> -LIBZLIB_CPE_ID_VENDOR = gnu
> +LIBZLIB_CPE_ID_VENDOR = zlib
> LIBZLIB_CPE_ID_PRODUCT = zlib
>
> # It is not possible to build only a shared version of zlib, so we build both
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-09-18 7:43 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-29 15:45 [Buildroot] [PATCH 1/2] package/libzlib: fix CPE vendor id Marcus Hoffmann
2022-08-29 15:45 ` [Buildroot] [PATCH 2/2] package/libzlib: backport security fix for CVE-2022-37434 Marcus Hoffmann
2022-09-18 7:43 ` [Buildroot] [PATCH 1/2] package/libzlib: fix CPE vendor id Peter Korsgaard
2022-08-29 17:14 Marcus Hoffmann
2022-08-30 21:29 ` Arnout Vandecappelle
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.