diff options
| author |   Andrej Valek <andrej.valek@siemens.com> | 2017-09-11 16:20:37 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-12 23:51:36 +0100 |
| commit | 9b248a17d60b70cb715f15c0401dc5ddc38eee98 (patch) | |
| tree | 6bfcdfd15ce858f4496cb3bcfbd0425037394d88 /meta/recipes-extended/libarchive/libarchive/CVE-2017-14166.patch | |
| parent | 7e3a7cd2426feac757def81850dc44156cd0f33e (diff) | |
| download | openembedded-core-contrib-9b248a17d60b70cb715f15c0401dc5ddc38eee98.tar.gz | |
libarchive: fix bug929 and CVE-2017-14166
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-extended/libarchive/libarchive/CVE-2017-14166.patch')
| -rw-r--r-- | meta/recipes-extended/libarchive/libarchive/CVE-2017-14166.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/meta/recipes-extended/libarchive/libarchive/CVE-2017-14166.patch b/meta/recipes-extended/libarchive/libarchive/CVE-2017-14166.patch new file mode 100644 index 0000000000..e85fec40aa --- /dev/null +++ b/meta/recipes-extended/libarchive/libarchive/CVE-2017-14166.patch @@ -0,0 +1,37 @@ +libarchive-3.3.2: Fix CVE-2017-14166 + +[No upstream tracking] -- https://github.com/libarchive/libarchive/pull/935 + +archive_read_support_format_xar: heap-based buffer overflow in xml_data + +Upstream-Status: Backport [https://github.com/libarchive/libarchive/commit/fa7438a0ff4033e4741c807394a9af6207940d71] +CVE: CVE-2017-14166 +Bug: 935 +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> + +diff --git a/libarchive/archive_read_support_format_xar.c b/libarchive/archive_read_support_format_xar.c +index 7a22beb..93eeacc 100644 +--- a/libarchive/archive_read_support_format_xar.c ++++ b/libarchive/archive_read_support_format_xar.c +@@ -1040,6 +1040,9 @@ atol10(const char *p, size_t char_cnt) + uint64_t l; + int digit; + ++ if (char_cnt == 0) ++ return (0); ++ + l = 0; + digit = *p - '0'; + while (digit >= 0 && digit < 10 && char_cnt-- > 0) { +@@ -1054,7 +1057,10 @@ atol8(const char *p, size_t char_cnt) + { + int64_t l; + int digit; +- ++ ++ if (char_cnt == 0) ++ return (0); ++ + l = 0; + while (char_cnt-- > 0) { + if (*p >= '0' && *p <= '7') |