Fix CVE-2017-14860 #108
Merged
Fix CVE-2017-14860 #108
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The errors you can throw are in src/error.cpp. If you feel it’s important, you can add a new error. I try to keep the errors “generic” to be used in different places. However you are welcome to add errors if you think this is required.
Robin
… On 5 Oct 2017, at 19:35, D4N ***@***.***> wrote:
A heap buffer overflow could occur in memcpy when icc.size_ is larger than data.size_ - pad, as then memcpy would read out of bounds of data.
This PR adds a sanity check to iccLength (= icc.size_): if it is larger than data.size_ - pad (i.e. an overflow would be caused) an exception is thrown. However it currently throws Error 57 which is invalid memory allocation request and imho rather inappropriate. Unfortunately I don't know which error would be better suited or if a new one should be created. @clanmills <https://github.com/clanmills> do you have an idea?
This fixes #71 <#71>.
You can view, comment on, or merge this pull request online at:
#108 <#108>
Commit Summary
Fix for CVE-2017-14860
Added the reproducer for CVE-2017-14860 to the test suite
File Changes
M src/jp2image.cpp <https://github.com/Exiv2/exiv2/pull/108/files#diff-0> (9)
M test/bugfixes-test.sh <https://github.com/Exiv2/exiv2/pull/108/files#diff-1> (7)
A test/data/003-heap-buffer-over <https://github.com/Exiv2/exiv2/pull/108/files#diff-2> (0)
M test/data/bugfixes-test.out <https://github.com/Exiv2/exiv2/pull/108/files#diff-3> (0)
Patch Links:
https://github.com/Exiv2/exiv2/pull/108.patch <https://github.com/Exiv2/exiv2/pull/108.patch>
https://github.com/Exiv2/exiv2/pull/108.diff <https://github.com/Exiv2/exiv2/pull/108.diff>
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub <#108>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAgWPpQJ_G14TW5hzcryU-apAipAugknks5spWe-gaJpZM4Pv1r6>.
|
|
Ok, please don't merge this yet then. I knew where the errors were, I just didn't find one that I found appropriate. How about a very generic error "Corrupted image meta-data"? To the end user this is pretty clear and a developer will probably have a debugger ready and will find out where it occurred. |
|
Sounds good to me. |
|
@D4N Could you consider adding an enum for the errors in error.hpp? It's easier to grep a throw in the code with a symbolic name such as Exiv2::kerImageParsingError than '58'. |
|
Sure, I'll do that. But I'd rather put that in a different PR. |
D4N
force-pushed
the
fix_CVE-2017-14860
branch
from
2ca652e to
391ddcb
Compare
|
I have created a new error message and updated the PR. |
|
The requested enumeration can be found in #109. |
|
I think this is OK. I’m in McDonalds and the internet connection to GitHub isn’t good. I’ve been able to approve #109 (the ErrorCodes). Can’t get through to #108 and #110. I’tl try from our hotel this evening.
Robin
… On 10 Oct 2017, at 16:18, D4N ***@***.***> wrote:
Can we merge this? I would like to first merged this patch, then #110 <#110> so that I can update the proposed error enumeration in #109 <#109>.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub <#108 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAgWPjQE0j6Tn5r2g1NdVpZp55GIyNzEks5sq9EFgaJpZM4Pv1r6>.
|
clanmills
approved these changes
Oct 10, 2017
A heap buffer overflow could occur in memcpy when icc.size_ is larger than data.size_ - pad, as then memcpy would read out of bounds of data. This commit adds a sanity check to iccLength (= icc.size_): if it is larger than data.size_ - pad (i.e. an overflow would be caused) an exception is thrown. This fixes Exiv2#71.
D4N
force-pushed
the
fix_CVE-2017-14860
branch
from
391ddcb to
c884a3b
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A heap buffer overflow could occur in
memcpywhenicc.size_is larger thandata.size_ - pad, as thenmemcpywould read out of bounds ofdata.This PR adds a sanity check to
iccLength(=icc.size_): if it is larger thandata.size_ - pad(i.e. an overflow would be caused) an exception is thrown. However it currently throws Error 57 which isinvalid memory allocation requestand imho rather inappropriate. Unfortunately I don't know which error would be better suited or if a new one should be created. @clanmills do you have an idea?This fixes #71.