libexif: fix CVE-2016-6328 and CVE-2018-20030
PATCH 1/1 libexif: fix CVE-2016-6328 and CVE-2018-20030
Signed-off-by Ross Burton <[email protected]>
--- .../libexif/libexif/CVE-2016-6328.patch | 64 ++++++++++++ .../libexif/libexif/CVE-2018-20030.patch | 115 +++++++++++++++++++++ meta/recipes-support/libexif/libexif_0.6.21.bb | 4 +- 3 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-support/libexif/libexif/CVE-2016-6328.patch create mode 100644 meta/recipes-support/libexif/libexif/CVE-2018-20030.patch
meta/recipes-support/libexif/libexif/CVE-2016-6328.patch new file +64 -0
@@ -0,0 +1,64 @@ +CVE: CVE-2016-6328 +Upstream-Status: Backport +Signed-off-by: Ross Burton <[email protected]> + +From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <[email protected]> +Date: Tue, 25 Jul 2017 23:44:44 +0200 +Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax + makernote entries. + +This should fix: +https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328 +--- + libexif/pentax/mnote-pentax-entry.c | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c +index d03d159..ea0429a 100644 +--- a/libexif/pentax/mnote-pentax-entry.c ++++ b/libexif/pentax/mnote-pentax-entry.c +@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, + case EXIF_FORMAT_SHORT: + { + const unsigned char *data = entry->data; +- size_t k, len = strlen(val); ++ size_t k, len = strlen(val), sizeleft; ++ ++ sizeleft = entry->size; + for(k=0; k<entry->components; k++) { ++ if (sizeleft < 2) ++ break; + vs = exif_get_short (data, entry->order); + snprintf (val+len, maxlen-len, "%i ", vs); + len = strlen(val); + data += 2; ++ sizeleft -= 2; + } + } + break; + case EXIF_FORMAT_LONG: + { + const unsigned char *data = entry->data; +- size_t k, len = strlen(val); ++ size_t k, len = strlen(val), sizeleft; ++ ++ sizeleft = entry->size; + for(k=0; k<entry->components; k++) { ++ if (sizeleft < 4) ++ break; + vl = exif_get_long (data, entry->order); + snprintf (val+len, maxlen-len, "%li", (long int) vl); + len = strlen(val); + data += 4; ++ sizeleft -= 4; + } + } + break; +@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry, + break; + } + +- return (val); ++ return val; + }
meta/recipes-support/libexif/libexif/CVE-2018-20030.patch new file +115 -0
115 lines not on this page · raw message
meta/recipes-support/libexif/libexif_0.6.21.bb +3 -1
@@ -5,7 +5,9 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=243b725d71bb5df4a1e5920b344b86ad" SRC_URI = "${SOURCEFORGE_MIRROR}/libexif/libexif-${PV}.tar.bz2 \ - file://CVE-2017-7544.patch" + file://CVE-2017-7544.patch \ + file://CVE-2016-6328.patch \ + file://CVE-2018-20030.patch" SRC_URI[md5sum] = "27339b89850f28c8f1c237f233e05b27" SRC_URI[sha256sum] = "16cdaeb62eb3e6dfab2435f7d7bccd2f37438d21c5218ec4e58efa9157d4d41a"
Signature · 1 line
2.11.0