diff options
author | Armin Kuster <akuster@mvista.com> | 2019-05-29 14:03:16 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-06-07 13:57:48 +0100 |
commit | 919d3c7b33538d1df99a6c2317099d0f5ffc49d4 (patch) | |
tree | dffcd3aa3420a369eca5501b226ffddb4cd2386e /meta | |
parent | fa29e17411fb5847a70892bcc264ba602da96239 (diff) | |
download | poky-919d3c7b33538d1df99a6c2317099d0f5ffc49d4.tar.gz |
Tar: Security fix CVE-2019-0023
Source: tar.git
MR: 97928
Type: Security Fix
Disposition: Backport from http://git.savannah.gnu.org/cgit/tar.git/commit/?id=cb07844454d8cc9fb21f53ace75975f91185a120
ChangeID: 7aee4c0daf8ce813242fe7b872583560a32bc4e3
Description:
Affects tar < 1.32
fixes CVE-2019-9923
(From OE-Core rev: fa40d49bfb0dedea7f3dad454c408e249f4c05f7)
Signed-off-by: Armin Kuster <akuster@mvista.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 @@ | |||
1 | From cb07844454d8cc9fb21f53ace75975f91185a120 Mon Sep 17 00:00:00 2001 | ||
2 | From: Sergey Poznyakoff <gray@gnu.org> | ||
3 | Date: Mon, 14 Jan 2019 15:22:09 +0200 | ||
4 | Subject: [PATCH] Fix possible NULL dereference (savannah bug #55369) | ||
5 | |||
6 | * src/sparse.c (pax_decode_header): Check return from find_next_block. | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | CVE: CVE-2019-9923 | ||
10 | Affects: tar < 1.32 | ||
11 | Signed-off-by: Armin kuster <akuster@mvista.com> | ||
12 | |||
13 | --- | ||
14 | src/sparse.c | 4 ++++ | ||
15 | 1 file changed, 4 insertions(+) | ||
16 | |||
17 | Index: tar-1.31/src/sparse.c | ||
18 | =================================================================== | ||
19 | --- tar-1.31.orig/src/sparse.c | ||
20 | +++ tar-1.31/src/sparse.c | ||
21 | @@ -1267,6 +1267,8 @@ pax_decode_header (struct tar_sparse_fil | ||
22 | { \ | ||
23 | set_next_block_after (b); \ | ||
24 | b = find_next_block (); \ | ||
25 | + if (!b) \ | ||
26 | + FATAL_ERROR ((0, 0, _("Unexpected EOF in archive"))); \ | ||
27 | src = b->buffer; \ | ||
28 | endp = b->buffer + BLOCKSIZE; \ | ||
29 | } \ | ||
30 | @@ -1279,6 +1281,8 @@ pax_decode_header (struct tar_sparse_fil | ||
31 | start = current_block_ordinal (); | ||
32 | set_next_block_after (current_header); | ||
33 | blk = find_next_block (); | ||
34 | + if (!blk) | ||
35 | + FATAL_ERROR ((0, 0, _("Unexpected EOF in archive"))); | ||
36 | p = blk->buffer; | ||
37 | COPY_BUF (blk,nbuf,p); | ||
38 | 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" | |||
9 | SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ | 9 | SRC_URI = "${GNU_MIRROR}/tar/tar-${PV}.tar.bz2 \ |
10 | file://remove-gets.patch \ | 10 | file://remove-gets.patch \ |
11 | file://musl_dirent.patch \ | 11 | file://musl_dirent.patch \ |
12 | file://CVE-2019-9923.patch \ | ||
12 | " | 13 | " |
13 | 14 | ||
14 | SRC_URI[md5sum] = "77afa35b696c8d760331fa0e12c2fac9" | 15 | SRC_URI[md5sum] = "77afa35b696c8d760331fa0e12c2fac9" |