diff options
Diffstat (limited to 'external/poky/meta/recipes-multimedia/libpng')
-rw-r--r-- | external/poky/meta/recipes-multimedia/libpng/libpng/CVE-2019-7317.patch | 20 | ||||
-rw-r--r-- | external/poky/meta/recipes-multimedia/libpng/libpng_1.6.36.bb | 32 |
2 files changed, 52 insertions, 0 deletions
diff --git a/external/poky/meta/recipes-multimedia/libpng/libpng/CVE-2019-7317.patch b/external/poky/meta/recipes-multimedia/libpng/libpng/CVE-2019-7317.patch new file mode 100644 index 00000000..6ee1f8da --- /dev/null +++ b/external/poky/meta/recipes-multimedia/libpng/libpng/CVE-2019-7317.patch @@ -0,0 +1,20 @@ +Use-after-free detected with static analysis. + +CVE: CVE-2019-7317 +Upstream-Status: Submitted [https://github.com/glennrp/libpng/issues/275] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/png.c b/png.c +index 9d9926f638..efd1aecfbd 100644 +--- a/png.c ++++ b/png.c +@@ -4588,8 +4588,7 @@ png_image_free(png_imagep image) + if (image != NULL && image->opaque != NULL && + image->opaque->error_buf == NULL) + { +- /* Ignore errors here: */ +- (void)png_safe_execute(image, png_image_free_function, image); ++ png_image_free_function(image); + image->opaque = NULL; + } + } diff --git a/external/poky/meta/recipes-multimedia/libpng/libpng_1.6.36.bb b/external/poky/meta/recipes-multimedia/libpng/libpng_1.6.36.bb new file mode 100644 index 00000000..a5862378 --- /dev/null +++ b/external/poky/meta/recipes-multimedia/libpng/libpng_1.6.36.bb @@ -0,0 +1,32 @@ +SUMMARY = "PNG image format decoding library" +HOMEPAGE = "http://www.libpng.org/" +SECTION = "libs" +LICENSE = "Libpng" +LIC_FILES_CHKSUM = "file://LICENSE;md5=12b4ec50384c800bc568f519671b120c \ + file://png.h;endline=144;md5=15ae15f53376306868259924a9db4e05 \ + " +DEPENDS = "zlib" + +LIBV = "16" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz \ + file://CVE-2019-7317.patch" +SRC_URI[md5sum] = "df2be2d29c40937fe1f5349b16bc2826" +SRC_URI[sha256sum] = "eceb924c1fa6b79172fdfd008d335f0e59172a86a66481e09d4089df872aa319" + +MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/ ${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/${PV}/" + +UPSTREAM_CHECK_URI = "http://libpng.org/pub/png/libpng.html" + +BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config" + +inherit autotools binconfig-disabled pkgconfig + +# Work around missing symbols +EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "neon", "--enable-arm-neon=on", "--enable-arm-neon=off" ,d)}" + +PACKAGES =+ "${PN}-tools" + +FILES_${PN}-tools = "${bindir}/png-fix-itxt ${bindir}/pngfix ${bindir}/pngcp" + +BBCLASSEXTEND = "native nativesdk" |