Skip to contentSkip to conversation

libarchive: fix CVE-2022-36227

PATCH In review Joe Slater 3 participants 3 messages Dec 6, 2022 – Dec 7, 2022

lore
Share & tools
lore

Joe Slater

author
#0 lore raw

PATCH 1/1 libarchive: fix CVE-2022-36227

Import a patch from libarchive applied after release 3.6.1.

---
 .../libarchive/cve-2022-36227.patch           | 48 +++++++++++++++++++
 .../libarchive/libarchive_3.6.1.bb            |  4 +-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch
meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch new file +48 -0
new file mode 100644
index 0000000000..4d13bf6492
@@ -0,0 +1,48 @@
+From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
+From: obiwac <[email protected]>
+Date: Fri, 22 Jul 2022 22:41:10 +0200
+Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754)
+
+---
+ libarchive/archive_write.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+---
+CVE: CVE-2022-36227
+
+Source-Repo: https://github.com/libarchive/libarchive.git
+
+Upstream-Status: Backport [bff38efe8c... unmodified]
+
+Signed-off-by: Joe Slater <[email protected]>
+
+---
+diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
+index 66592e82..27626b54 100644
+--- a/libarchive/archive_write.c
++++ b/libarchive/archive_write.c
+@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
+ 	struct archive_write_filter *f;
+ 
+ 	f = calloc(1, sizeof(*f));
++
++	if (f == NULL)
++		return (NULL);
++
+ 	f->archive = _a;
+ 	f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
+ 	if (a->filter_first == NULL)
+@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
+ 	a->client_data = client_data;
+ 
+ 	client_filter = __archive_write_allocate_filter(_a);
++
++	if (client_filter == NULL)
++		return (ARCHIVE_FATAL);
++
+ 	client_filter->open = archive_write_client_open;
+ 	client_filter->write = archive_write_client_write;
+ 	client_filter->close = archive_write_client_close;
+-- 
+2.38.1
+
meta/recipes-extended/libarchive/libarchive_3.6.1.bb +3 -1
index c795b41628..8213940ad3 100644
@@ -32,7 +32,9 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd,"
 
 EXTRA_OECONF += "--enable-largefile"
 
-SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz"
+SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
+           file://cve-2022-36227.patch"
+
 UPSTREAM_CHECK_URI = "http://libarchive.org/"
 
 SRC_URI[sha256sum] = "c676146577d989189940f1959d9e3980d28513d74eedfbc6b7f15ea45fe54ee2"
Signature · 1 line
2.38.1
#1 lore raw

Re: [kirkstone][oe-core][PATCH 1/1] libarchive: fix CVE-2022-36227 -- and langdale !

Quoted 1 line · Joe Slater

Import a patch from libarchive applied after release 3.6.1.

Thanks Joe.

Steve,

This should apply to langdale as well.

../Randy

Quoted 77 lines
---
  .../libarchive/cve-2022-36227.patch           | 48 +++++++++++++++++++
  .../libarchive/libarchive_3.6.1.bb            |  4 +-
  2 files changed, 51 insertions(+), 1 deletion(-)

create mode 100644 meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch

meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch new file +48 -0
new file mode 100644
index 0000000000..4d13bf6492
@@ -0,0 +1,48 @@
+From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
+From: obiwac <[email protected]>
+Date: Fri, 22 Jul 2022 22:41:10 +0200
+Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754)
+
+---
+ libarchive/archive_write.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+---
+CVE: CVE-2022-36227
+
+Source-Repo: https://github.com/libarchive/libarchive.git
+
+Upstream-Status: Backport [bff38efe8c... unmodified]
+
+Signed-off-by: Joe Slater <[email protected]>
+
+---
+diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
+index 66592e82..27626b54 100644
+--- a/libarchive/archive_write.c
++++ b/libarchive/archive_write.c
+@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
+ 	struct archive_write_filter *f;
+
+ 	f = calloc(1, sizeof(*f));
++
++	if (f == NULL)
++		return (NULL);
++
+ 	f->archive = _a;
+ 	f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
+ 	if (a->filter_first == NULL)
+@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
+ 	a->client_data = client_data;
+
+ 	client_filter = __archive_write_allocate_filter(_a);
++
++	if (client_filter == NULL)
++		return (ARCHIVE_FATAL);
++
+ 	client_filter->open = archive_write_client_open;
+ 	client_filter->write = archive_write_client_write;
+ 	client_filter->close = archive_write_client_close;
+--
+2.38.1
+
meta/recipes-extended/libarchive/libarchive_3.6.1.bb +3 -1
index c795b41628..8213940ad3 100644
@@ -32,7 +32,9 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd,"
 
  EXTRA_OECONF += "--enable-largefile"
 
-SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz"
+SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
+           file://cve-2022-36227.patch"
+
  UPSTREAM_CHECK_URI = "http://libarchive.org/"
 
  SRC_URI[sha256sum] = "c676146577d989189940f1959d9e3980d28513d74eedfbc6b7f15ea45fe54ee2"
Signature · 2 lines
# Randy MacLeod
# Wind River Linux
#2 lore raw

Re: [kirkstone][oe-core][PATCH 1/1] libarchive: fix CVE-2022-36227 -- and langdale !

Quoted 9 lines · Randy MacLeod
Quoted 1 line · Joe Slater

Import a patch from libarchive applied after release 3.6.1.

Thanks Joe.

Steve,

This should apply to langdale as well.

"Should" :-)

It doesn't apply cleanly due to:
https://git.openembedded.org/openembedded-core-contrib/commit/?h=stable/langdale-nut&id=339055f5abc30ea5dc26184c94a2da39ed46a22f

But I'll tweak the patch and see what happens on the autobuilder.

Steve

Quoted 83 lines
Quoted 67 lines
---
  .../libarchive/cve-2022-36227.patch           | 48 +++++++++++++++++++
  .../libarchive/libarchive_3.6.1.bb            |  4 +-
  2 files changed, 51 insertions(+), 1 deletion(-)

create mode 100644 meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch

meta/recipes-extended/libarchive/libarchive/cve-2022-36227.patch new file +48 -0
new file mode 100644
index 0000000000..4d13bf6492
@@ -0,0 +1,48 @@
+From bff38efe8c110469c5080d387bec62a6ca15b1a5 Mon Sep 17 00:00:00 2001
+From: obiwac <[email protected]>
+Date: Fri, 22 Jul 2022 22:41:10 +0200
+Subject: [PATCH] libarchive: Handle a `calloc` returning NULL (fixes #1754)
+
+---
+ libarchive/archive_write.c | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+---
+CVE: CVE-2022-36227
+
+Source-Repo: https://github.com/libarchive/libarchive.git
+
+Upstream-Status: Backport [bff38efe8c... unmodified]
+
+Signed-off-by: Joe Slater <[email protected]>
+
+---
+diff --git a/libarchive/archive_write.c b/libarchive/archive_write.c
+index 66592e82..27626b54 100644
+--- a/libarchive/archive_write.c
++++ b/libarchive/archive_write.c
+@@ -201,6 +201,10 @@ __archive_write_allocate_filter(struct archive *_a)
+     struct archive_write_filter *f;
+
+     f = calloc(1, sizeof(*f));
++
++    if (f == NULL)
++            return (NULL);
++
+     f->archive = _a;
+     f->state = ARCHIVE_WRITE_FILTER_STATE_NEW;
+     if (a->filter_first == NULL)
+@@ -548,6 +552,10 @@ archive_write_open2(struct archive *_a, void *client_data,
+     a->client_data = client_data;
+
+     client_filter = __archive_write_allocate_filter(_a);
++
++    if (client_filter == NULL)
++            return (ARCHIVE_FATAL);
++
+     client_filter->open = archive_write_client_open;
+     client_filter->write = archive_write_client_write;
+     client_filter->close = archive_write_client_close;
+--
+2.38.1
+
meta/recipes-extended/libarchive/libarchive_3.6.1.bb +0 -0
index c795b41628..8213940ad3 100644

meta/recipes-extended/libarchive/libarchive_3.6.1.bb PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd," · line 40

Quoted 10 lines
meta/recipes-extended/libarchive/libarchive_3.6.1.bb +3 -1
@@ -32,7 +32,9 @@ PACKAGECONFIG[zstd] = "--with-zstd,--without-zstd,zstd,"
 
  EXTRA_OECONF += "--enable-largefile"
 
-SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz"
+SRC_URI = "http://libarchive.org/downloads/libarchive-${PV}.tar.gz \
+           file://cve-2022-36227.patch"
+
  UPSTREAM_CHECK_URI = "http://libarchive.org/"
 
  SRC_URI[sha256sum] = "c676146577d989189940f1959d9e3980d28513d74eedfbc6b7f15ea45fe54ee2"

--
# Randy MacLeod
# Wind River Linux