|
 |
6392af |
From 41bd04234b104312f54d25822f68738ba8d7133d Mon Sep 17 00:00:00 2001
|
|
|
6392af |
From: Marcus Meissner <marcus@jet.franken.de>
|
|
|
6392af |
Date: Tue, 25 Jul 2017 23:44:44 +0200
|
|
|
6392af |
Subject: [PATCH] fixes some (not all) buffer overreads during decoding pentax
|
|
|
6392af |
makernote entries.
|
|
|
6392af |
|
|
|
6392af |
This should fix:
|
|
|
6392af |
https://sourceforge.net/p/libexif/bugs/125/ CVE-2016-6328
|
|
|
6392af |
---
|
|
|
6392af |
libexif/pentax/mnote-pentax-entry.c | 16 +++++++++++++---
|
|
|
6392af |
1 file changed, 13 insertions(+), 3 deletions(-)
|
|
|
6392af |
|
|
|
6392af |
diff --git a/libexif/pentax/mnote-pentax-entry.c b/libexif/pentax/mnote-pentax-entry.c
|
|
|
6392af |
index d03d159..ea0429a 100644
|
|
|
6392af |
--- a/libexif/pentax/mnote-pentax-entry.c
|
|
|
6392af |
+++ b/libexif/pentax/mnote-pentax-entry.c
|
|
|
6392af |
@@ -425,24 +425,34 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
|
|
|
6392af |
case EXIF_FORMAT_SHORT:
|
|
|
6392af |
{
|
|
|
6392af |
const unsigned char *data = entry->data;
|
|
|
6392af |
- size_t k, len = strlen(val);
|
|
|
6392af |
+ size_t k, len = strlen(val), sizeleft;
|
|
|
6392af |
+
|
|
|
6392af |
+ sizeleft = entry->size;
|
|
|
6392af |
for(k=0; k<entry->components; k++) {
|
|
|
6392af |
+ if (sizeleft < 2)
|
|
|
6392af |
+ break;
|
|
|
6392af |
vs = exif_get_short (data, entry->order);
|
|
|
6392af |
snprintf (val+len, maxlen-len, "%i ", vs);
|
|
|
6392af |
len = strlen(val);
|
|
|
6392af |
data += 2;
|
|
|
6392af |
+ sizeleft -= 2;
|
|
|
6392af |
}
|
|
|
6392af |
}
|
|
|
6392af |
break;
|
|
|
6392af |
case EXIF_FORMAT_LONG:
|
|
|
6392af |
{
|
|
|
6392af |
const unsigned char *data = entry->data;
|
|
|
6392af |
- size_t k, len = strlen(val);
|
|
|
6392af |
+ size_t k, len = strlen(val), sizeleft;
|
|
|
6392af |
+
|
|
|
6392af |
+ sizeleft = entry->size;
|
|
|
6392af |
for(k=0; k<entry->components; k++) {
|
|
|
6392af |
+ if (sizeleft < 4)
|
|
|
6392af |
+ break;
|
|
|
6392af |
vl = exif_get_long (data, entry->order);
|
|
|
6392af |
snprintf (val+len, maxlen-len, "%li", (long int) vl);
|
|
|
6392af |
len = strlen(val);
|
|
|
6392af |
data += 4;
|
|
|
6392af |
+ sizeleft -= 4;
|
|
|
6392af |
}
|
|
|
6392af |
}
|
|
|
6392af |
break;
|
|
|
6392af |
@@ -455,5 +465,5 @@ mnote_pentax_entry_get_value (MnotePentaxEntry *entry,
|
|
|
6392af |
break;
|
|
|
6392af |
}
|
|
|
6392af |
|
|
|
6392af |
- return (val);
|
|
|
6392af |
+ return val;
|
|
|
6392af |
}
|