diff options
| author |   Andreas Sturmlechner <asturm@gentoo.org> | 2018-09-18 11:20:08 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2018-09-18 11:22:45 +0200 |
| commit | 96e70c303fbdd5949b7235132de1d4bf4a88a950 (patch) | |
| tree | f4ce22d690d992ca3fb2a041ac65dae45cd87ad2 /media-libs/libexif | |
| parent | media-libs/libexif: EAPI-7 bump (diff) | |
| download | gentoo-96e70c303fbdd5949b7235132de1d4bf4a88a950.tar.gz gentoo-96e70c303fbdd5949b7235132de1d4bf4a88a950.tar.bz2 gentoo-96e70c303fbdd5949b7235132de1d4bf4a88a950.zip | |
media-libs/libexif: Fix CVE-2017-7544
Bug: https://bugs.gentoo.org/631850
Package-Manager: Portage-2.3.49, Repoman-2.3.10
Diffstat (limited to 'media-libs/libexif')
| -rw-r--r-- | media-libs/libexif/files/libexif-0.6.21-CVE-2017-7544.patch | 30 | ||||
| -rw-r--r-- | media-libs/libexif/libexif-0.6.21-r2.ebuild | 5 |
2 files changed, 34 insertions, 1 deletions
diff --git a/media-libs/libexif/files/libexif-0.6.21-CVE-2017-7544.patch b/media-libs/libexif/files/libexif-0.6.21-CVE-2017-7544.patch new file mode 100644 index 000000000000..534817417d84 --- /dev/null +++ b/media-libs/libexif/files/libexif-0.6.21-CVE-2017-7544.patch @@ -0,0 +1,30 @@ +From c39acd1692023b26290778a02a9232c873f9d71a Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <marcus@jet.franken.de> +Date: Tue, 25 Jul 2017 23:38:56 +0200 +Subject: [PATCH] On saving makernotes, make sure the makernote container tags + has a type with 1 byte components. + +Fixes (at least): + https://sourceforge.net/p/libexif/bugs/130 + https://sourceforge.net/p/libexif/bugs/129 +--- + libexif/exif-data.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libexif/exif-data.c b/libexif/exif-data.c +index 67df4db..91f4c33 100644 +--- a/libexif/exif-data.c ++++ b/libexif/exif-data.c +@@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e, + exif_mnote_data_set_offset (data->priv->md, *ds - 6); + exif_mnote_data_save (data->priv->md, &e->data, &e->size); + e->components = e->size; ++ if (exif_format_get_size (e->format) != 1) { ++ /* e->format is taken from input code, ++ * but we need to make sure it is a 1 byte ++ * entity due to the multiplication below. */ ++ e->format = EXIF_FORMAT_UNDEFINED; ++ } + } + } + diff --git a/media-libs/libexif/libexif-0.6.21-r2.ebuild b/media-libs/libexif/libexif-0.6.21-r2.ebuild index 252bbbbc790d..268199851425 100644 --- a/media-libs/libexif/libexif-0.6.21-r2.ebuild +++ b/media-libs/libexif/libexif-0.6.21-r2.ebuild @@ -21,7 +21,10 @@ BDEPEND=" doc? ( app-doc/doxygen ) nls? ( sys-devel/gettext )" -PATCHES=( "${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-0.6.13-pkgconfig.patch + "${FILESDIR}"/${P}-CVE-2017-7544.patch +) src_prepare() { default |