diff options
Diffstat (limited to 'meta/recipes-devtools/opkg/opkg')
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/open_inner.patch | 46 | ||||
-rw-r--r-- | meta/recipes-devtools/opkg/opkg/opkg_archive.patch | 54 |
2 files changed, 100 insertions, 0 deletions
diff --git a/meta/recipes-devtools/opkg/opkg/open_inner.patch b/meta/recipes-devtools/opkg/opkg/open_inner.patch new file mode 100644 index 0000000000..278e099e3a --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/open_inner.patch | |||
@@ -0,0 +1,46 @@ | |||
1 | From alejandro.delcastillo@ni.com Wed Nov 20 22:35:02 2019 | ||
2 | From: Alejandro del Castillo <alejandro.delcastillo@ni.com> | ||
3 | To: <opkg-devel@googlegroups.com>, <richard.purdie@linuxfoundation.org> | ||
4 | CC: Alejandro del Castillo <alejandro.delcastillo@ni.com> | ||
5 | Subject: [opkg][PATCH 2/2] open_inner: add support for empty payloads | ||
6 | Date: Wed, 20 Nov 2019 16:34:48 -0600 | ||
7 | Message-ID: <20191120223448.26522-3-alejandro.delcastillo@ni.com> | ||
8 | X-Mailer: git-send-email 2.22.0 | ||
9 | In-Reply-To: <20191120223448.26522-1-alejandro.delcastillo@ni.com> | ||
10 | References: <20191120223448.26522-1-alejandro.delcastillo@ni.com> | ||
11 | MIME-Version: 1.0 | ||
12 | Content-Type: text/plain | ||
13 | Content-Transfer-Encoding: 8bit | ||
14 | |||
15 | Support for empty compressed payloads need to be explicitly enabled on | ||
16 | libarchive. | ||
17 | |||
18 | Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> | ||
19 | |||
20 | Upstream-Status: Backport | ||
21 | --- | ||
22 | libopkg/opkg_archive.c | 7 +++++++ | ||
23 | 1 file changed, 7 insertions(+) | ||
24 | |||
25 | diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c | ||
26 | index 0e9ccea..f19cece 100644 | ||
27 | --- a/libopkg/opkg_archive.c | ||
28 | +++ b/libopkg/opkg_archive.c | ||
29 | @@ -618,6 +618,13 @@ static struct archive *open_inner(struct archive *outer) | ||
30 | goto err_cleanup; | ||
31 | } | ||
32 | |||
33 | + r = archive_read_support_format_empty(inner); | ||
34 | + if (r != ARCHIVE_OK) { | ||
35 | + opkg_msg(ERROR, "Empty format not supported: %s\n", | ||
36 | + archive_error_string(inner)); | ||
37 | + goto err_cleanup; | ||
38 | + } | ||
39 | + | ||
40 | r = archive_read_open(inner, data, NULL, inner_read, inner_close); | ||
41 | if (r != ARCHIVE_OK) { | ||
42 | opkg_msg(ERROR, "Failed to open inner archive: %s\n", | ||
43 | -- | ||
44 | 2.22.0 | ||
45 | |||
46 | |||
diff --git a/meta/recipes-devtools/opkg/opkg/opkg_archive.patch b/meta/recipes-devtools/opkg/opkg/opkg_archive.patch new file mode 100644 index 0000000000..3e1ebae953 --- /dev/null +++ b/meta/recipes-devtools/opkg/opkg/opkg_archive.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From alejandro.delcastillo@ni.com Wed Nov 20 22:35:01 2019 | ||
2 | Return-Path: <richard.purdie+caf_=rpurdie=rpsys.net@linuxfoundation.org> | ||
3 | From: Alejandro del Castillo <alejandro.delcastillo@ni.com> | ||
4 | To: <opkg-devel@googlegroups.com>, <richard.purdie@linuxfoundation.org> | ||
5 | CC: Alejandro del Castillo <alejandro.delcastillo@ni.com> | ||
6 | Subject: [opkg][PATCH 1/2] opkg_archive.c: avoid double free on uncompress | ||
7 | error | ||
8 | Date: Wed, 20 Nov 2019 16:34:47 -0600 | ||
9 | Message-ID: <20191120223448.26522-2-alejandro.delcastillo@ni.com> | ||
10 | X-Mailer: git-send-email 2.22.0 | ||
11 | In-Reply-To: <20191120223448.26522-1-alejandro.delcastillo@ni.com> | ||
12 | References: <20191120223448.26522-1-alejandro.delcastillo@ni.com> | ||
13 | MIME-Version: 1.0 | ||
14 | Content-Type: text/plain | ||
15 | Content-Transfer-Encoding: 8bit | ||
16 | |||
17 | The open-inner function calls archive_read_open. On error, | ||
18 | archive_read_open calls inner_close, which also closes the outter | ||
19 | archive. On error, return NULL directly to avoid double free. | ||
20 | |||
21 | |||
22 | Upstream-Status: Backport | ||
23 | |||
24 | Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com> | ||
25 | --- | ||
26 | libopkg/opkg_archive.c | 4 ++-- | ||
27 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
28 | |||
29 | diff --git a/libopkg/opkg_archive.c b/libopkg/opkg_archive.c | ||
30 | index 3d87db1..0e9ccea 100644 | ||
31 | --- a/libopkg/opkg_archive.c | ||
32 | +++ b/libopkg/opkg_archive.c | ||
33 | @@ -622,7 +622,7 @@ static struct archive *open_inner(struct archive *outer) | ||
34 | if (r != ARCHIVE_OK) { | ||
35 | opkg_msg(ERROR, "Failed to open inner archive: %s\n", | ||
36 | archive_error_string(inner)); | ||
37 | - goto err_cleanup; | ||
38 | + return NULL; | ||
39 | } | ||
40 | |||
41 | return inner; | ||
42 | @@ -683,7 +683,7 @@ static struct archive *extract_outer(const char *filename, const char *arname) | ||
43 | |||
44 | inner = open_inner(outer); | ||
45 | if (!inner) | ||
46 | - goto err_cleanup; | ||
47 | + return NULL; | ||
48 | |||
49 | return inner; | ||
50 | |||
51 | -- | ||
52 | 2.22.0 | ||
53 | |||
54 | |||