mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-16 15:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

opkg: Add upstream fixes for empty packages

Browse Source 
An ipk with a zero size data.tar file caused opkg to crash with a
double free abort. Add the upstream fixes for this.

(From OE-Core rev: ea1ded0b47e85d039dfad2b59580817bfb335739)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2019-11-23 08:18:38 -08:00
parent f5efafffbc
commit 26f62a423d
3 changed files with 102 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
meta/recipes-devtools/opkg/opkg/open_inner.patch Normal file
View File

@@ -0,0 +1,46 @@
From alejandro.delcastillo@ni.com Wed Nov 20 22:35:02 2019
From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
To: <opkg-devel@googlegroups.com>, <richard.purdie@linuxfoundation.org>
CC: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Subject: [opkg][PATCH 2/2] open_inner: add support for empty payloads
Date: Wed, 20 Nov 2019 16:34:48 -0600
Message-ID: <20191120223448.26522-3-alejandro.delcastillo@ni.com>
X-Mailer: git-send-email 2.22.0
In-Reply-To: <20191120223448.26522-1-alejandro.delcastillo@ni.com>
References: <20191120223448.26522-1-alejandro.delcastillo@ni.com>
MIME-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 8bit
Support for empty compressed payloads need to be explicitly enabled on
libarchive.
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Upstream-Status: Backport
---
libopkg/opkg_archive.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c
index 0e9ccea..f19cece 100644
--- a/libopkg/opkg_archive.c
+++ b/libopkg/opkg_archive.c
@@ -618,6 +618,13 @@ static struct archive *open_inner(struct archive *outer)
goto err_cleanup;
}
+ r = archive_read_support_format_empty(inner);
+ if (r != ARCHIVE_OK) {
+ opkg_msg(ERROR, "Empty format not supported: %s\n",
+ archive_error_string(inner));
+ goto err_cleanup;
+ }
+
r = archive_read_open(inner, data, NULL, inner_read, inner_close);
if (r != ARCHIVE_OK) {
opkg_msg(ERROR, "Failed to open inner archive: %s\n",
--
2.22.0

54
meta/recipes-devtools/opkg/opkg/opkg_archive.patch Normal file
View File

@@ -0,0 +1,54 @@
From alejandro.delcastillo@ni.com Wed Nov 20 22:35:01 2019
Return-Path: <richard.purdie+caf_=rpurdie=rpsys.net@linuxfoundation.org>
From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
To: <opkg-devel@googlegroups.com>, <richard.purdie@linuxfoundation.org>
CC: Alejandro del Castillo <alejandro.delcastillo@ni.com>
Subject: [opkg][PATCH 1/2] opkg_archive.c: avoid double free on uncompress
error
Date: Wed, 20 Nov 2019 16:34:47 -0600
Message-ID: <20191120223448.26522-2-alejandro.delcastillo@ni.com>
X-Mailer: git-send-email 2.22.0
In-Reply-To: <20191120223448.26522-1-alejandro.delcastillo@ni.com>
References: <20191120223448.26522-1-alejandro.delcastillo@ni.com>
MIME-Version: 1.0
Content-Type: text/plain
Content-Transfer-Encoding: 8bit
The open-inner function calls archive_read_open. On error,
archive_read_open calls inner_close, which also closes the outter
archive. On error, return NULL directly to avoid double free.
Upstream-Status: Backport
Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
---
libopkg/opkg_archive.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c
index 3d87db1..0e9ccea 100644
--- a/libopkg/opkg_archive.c
+++ b/libopkg/opkg_archive.c
@@ -622,7 +622,7 @@ static struct archive *open_inner(struct archive *outer)
if (r != ARCHIVE_OK) {
opkg_msg(ERROR, "Failed to open inner archive: %s\n",
archive_error_string(inner));
- goto err_cleanup;
+ return NULL;
}
return inner;
@@ -683,7 +683,7 @@ static struct archive *extract_outer(const char *filename, const char *arname)
inner = open_inner(outer);
if (!inner)
- goto err_cleanup;
+ return NULL;
return inner;
--
2.22.0

2
meta/recipes-devtools/opkg/opkg_0.4.1.bb
View File

@@ -14,6 +14,8 @@ PE = "1"
SRC_URI = "http://downloads.yoctoproject.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
file://opkg.conf \
file://0001-opkg_conf-create-opkg.lock-in-run-instead-of-var-run.patch \
file://opkg_archive.patch \
file://open_inner.patch \
file://run-ptest \
"