opkg: Add upstream fixes for empty packages

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

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/opkg/opkg/open_inner.patch b/meta/recipes-devtools/opkg/opkg/open_inner.patch
new file mode 100644 (file)
index 0000000..278e099
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/open_inner.patch
@@ -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\r
+libarchive.\r
+\r
+Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>\r
+
+Upstream-Status: Backport
+---\r
+ libopkg/opkg_archive.c | 7 +++++++\r
+ 1 file changed, 7 insertions(+)\r
+\r
+diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c\r
+index 0e9ccea..f19cece 100644\r
+--- a/libopkg/opkg_archive.c\r
++++ b/libopkg/opkg_archive.c\r
+@@ -618,6 +618,13 @@ static struct archive *open_inner(struct archive *outer)\r
+         goto err_cleanup;\r
+     }\r
+ \r
++    r = archive_read_support_format_empty(inner);\r
++    if (r != ARCHIVE_OK) {\r
++        opkg_msg(ERROR, "Empty format not supported: %s\n",\r
++                 archive_error_string(inner));\r
++        goto err_cleanup;\r
++    }\r
++\r
+     r = archive_read_open(inner, data, NULL, inner_read, inner_close);\r
+     if (r != ARCHIVE_OK) {\r
+         opkg_msg(ERROR, "Failed to open inner archive: %s\n",\r
+-- \r
+2.22.0\r
+\r
+

diff --git a/meta/recipes-devtools/opkg/opkg/opkg_archive.patch b/meta/recipes-devtools/opkg/opkg/opkg_archive.patch
new file mode 100644 (file)
index 0000000..3e1ebae
--- /dev/null
+++ b/meta/recipes-devtools/opkg/opkg/opkg_archive.patch
@@ -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,\r
+archive_read_open calls inner_close, which also closes the outter\r
+archive. On error, return NULL directly to avoid double free.\r
+\r
+
+Upstream-Status: Backport
+
+Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>\r
+---\r
+ libopkg/opkg_archive.c | 4 ++--\r
+ 1 file changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c\r
+index 3d87db1..0e9ccea 100644\r
+--- a/libopkg/opkg_archive.c\r
++++ b/libopkg/opkg_archive.c\r
+@@ -622,7 +622,7 @@ static struct archive *open_inner(struct archive *outer)\r
+     if (r != ARCHIVE_OK) {\r
+         opkg_msg(ERROR, "Failed to open inner archive: %s\n",\r
+                  archive_error_string(inner));\r
+-        goto err_cleanup;\r
++        return NULL;\r
+     }\r
+ \r
+     return inner;\r
+@@ -683,7 +683,7 @@ static struct archive *extract_outer(const char *filename, const char *arname)\r
+ \r
+     inner = open_inner(outer);\r
+     if (!inner)\r
+-        goto err_cleanup;\r
++        return NULL;\r
+ \r
+     return inner;\r
+ \r
+-- \r
+2.22.0\r
+\r
+

diff --git a/meta/recipes-devtools/opkg/opkg_0.4.1.bb b/meta/recipes-devtools/opkg/opkg_0.4.1.bb
index 149ee3ca190eed12eda19c3089808ad131c89a3f..f0ae8b36bd1d0308cc91e52c0d0e44d26b94133c 100644 (file)
--- a/meta/recipes-devtools/opkg/opkg_0.4.1.bb
+++ b/meta/recipes-devtools/opkg/opkg_0.4.1.bb
@@ -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 \
 "