diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/recipes-extended/tar/tar/CVE-2019-9923.patch | 38 | ||||
-rw-r--r-- | meta/recipes-extended/tar/tar_1.31.bb | 1 |
2 files changed, 39 insertions, 0 deletions
diff --git a/meta/recipes-extended/tar/tar/CVE-2019-9923.patch b/meta/recipes-extended/tar/tar/CVE-2019-9923.patch new file mode 100644 index 0000000000..a2704c3355 --- /dev/null +++ b/meta/recipes-extended/tar/tar/CVE-2019-9923.patch @@ -0,0 +1,38 @@ +From cb07844454d8cc9fb21f53ace75975f91185a120 Mon Sep 17 00:00:00 2001 +From: Sergey Poznyakoff <gray@gnu.org> +Date: Mon, 14 Jan 2019 15:22:09 +0200 +Subject: [PATCH] Fix possible NULL dereference (savannah bug #55369) + +* src/sparse.c (pax_decode_header): Check return from find_next_block. + +Upstream-Status: Backport +CVE: CVE-2019-9923 +Affects: tar < 1.32 +Signed-off-by: Armin kuster <akuster@mvista.com> + +--- + src/sparse.c | 4 ++++ + 1 file changed, 4 insertions(+) + +Index: tar-1.31/src/sparse.c +=================================================================== +--- tar-1.31.orig/src/sparse.c ++++ tar-1.31/src/sparse.c +@@ -1267,6 +1267,8 @@ pax_decode_header (struct tar_sparse_fil + { \ + set_next_block_after (b); \ + b = find_next_block (); \ ++ if (!b) \ ++ FATAL_ERROR ((0, 0, _("Unexpected EOF in archive"))); \ + src = b->buffer; \ + endp = b->buffer + BLOCKSIZE; \ + } \ +@@ -1279,6 +1281,8 @@ pax_decode_header (struct tar_sparse_fil + start = current_block_ordinal (); + set_next_block_after (current_header); + blk = find_next_block (); ++ if (!blk) ++ FATAL_ERROR ((0, 0, _("Unexpected EOF in archive"))); + p = blk->buffer; + COPY_BUF (blk,nbuf,p); + if (!decode_num (&u, nbuf, TYPE_MAXIMUM (size_t))) diff --git a/meta/recipes-extended/tar/tar_1.31.bb b/meta/recipes-extended/tar/tar_1.31.bb index 353617e95f..4a9d03cbc1 100644 --- a/meta/recipes-extended/tar/tar_1.31.bb +++ b/meta/recipes-extended/tar/tar_1.31.bb @@ -9,6 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ file://remove-gets.patch \ file://musl_dirent.patch \ + file://CVE-2019-9923.patch \ " SRC_URI[md5sum] = "77afa35b696c8d760331fa0e12c2fac9" |