diff options
author | Changqing Li <changqing.li@windriver.com> | 2018-08-28 15:22:18 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-29 10:42:48 +0100 |
commit | 3f0c92bae0810c57e4517b7e141e862eebc99082 (patch) | |
tree | ddfb1bd776745fbd98aacc979dd8ed5fba0b1585 /meta/recipes-support/libexif/libexif | |
parent | ff9f07b8a4beac1b1ae93ef6bb97901be80d0b78 (diff) | |
download | poky-3f0c92bae0810c57e4517b7e141e862eebc99082.tar.gz |
libexif: patch for CVE-2017-7544
(From OE-Core rev: b25f5e8efbe723520fa6e6311767c35e4cb71859)
Signed-off-by: Changqing Li <changqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-support/libexif/libexif')
-rw-r--r-- | meta/recipes-support/libexif/libexif/CVE-2017-7544.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/meta/recipes-support/libexif/libexif/CVE-2017-7544.patch b/meta/recipes-support/libexif/libexif/CVE-2017-7544.patch new file mode 100644 index 0000000000..e49481ff84 --- /dev/null +++ b/meta/recipes-support/libexif/libexif/CVE-2017-7544.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 8a92f964a66d476ca8907234359e92a70fc1325b Mon Sep 17 00:00:00 2001 | ||
2 | From: Changqing Li <changqing.li@windriver.com> | ||
3 | Date: Tue, 28 Aug 2018 15:12:10 +0800 | ||
4 | Subject: [PATCH] On saving makernotes, make sure the makernote container tags | ||
5 | has a type with 1 byte components. | ||
6 | |||
7 | Fixes (at least): | ||
8 | https://sourceforge.net/p/libexif/bugs/130 | ||
9 | https://sourceforge.net/p/libexif/bugs/129 | ||
10 | |||
11 | Upstream-Status: Backport[https://github.com/libexif/libexif/commit/ | ||
12 | c39acd1692023b26290778a02a9232c873f9d71a#diff-830e348923810f00726700b083ec00cd] | ||
13 | |||
14 | CVE: CVE-2017-7544 | ||
15 | |||
16 | Signed-off-by: Changqing Li <changqing.li@windriver.com> | ||
17 | --- | ||
18 | libexif/exif-data.c | 6 ++++++ | ||
19 | 1 file changed, 6 insertions(+) | ||
20 | |||
21 | diff --git a/libexif/exif-data.c b/libexif/exif-data.c | ||
22 | index 67df4db..6bf89eb 100644 | ||
23 | --- a/libexif/exif-data.c | ||
24 | +++ b/libexif/exif-data.c | ||
25 | @@ -255,6 +255,12 @@ exif_data_save_data_entry (ExifData *data, ExifEntry *e, | ||
26 | exif_mnote_data_set_offset (data->priv->md, *ds - 6); | ||
27 | exif_mnote_data_save (data->priv->md, &e->data, &e->size); | ||
28 | e->components = e->size; | ||
29 | + if (exif_format_get_size (e->format) != 1) { | ||
30 | + /* e->format is taken from input code, | ||
31 | + * but we need to make sure it is a 1 byte | ||
32 | + * entity due to the multiplication below. */ | ||
33 | + e->format = EXIF_FORMAT_UNDEFINED; | ||
34 | + } | ||
35 | } | ||
36 | } | ||
37 | |||
38 | -- | ||
39 | 2.7.4 | ||
40 | |||