Add CVE-2013-1441, exactimage: DoS, econvert crashes
authorSven Eckelmann <sven@narfation.org>
Wed, 4 Sep 2013 18:44:42 +0000 (20:44 +0200)
committerSven Eckelmann <sven@narfation.org>
Wed, 4 Sep 2013 18:44:42 +0000 (20:44 +0200)
debian/changelog
debian/patches/CVE-2013-1441.patch [new file with mode: 0644]
debian/patches/series

index 7ec407f..1d27355 100644 (file)
@@ -1,7 +1,10 @@
 exactimage (0.8.9-2) UNRELEASED; urgency=low
 
+  * Fix CVE-2013-1441: exactimage: DoS, econvert crashes
   * debian/gbp.conf
     - Force pristine-tar to guarantee correct orig tarball with git-buildpackage
+  * debian/patches:
+    - Add CVE-2013-1441, exactimage: DoS, econvert crashes
 
  -- Sven Eckelmann <sven@narfation.org>  Sat, 31 Aug 2013 22:36:46 +0200
 
diff --git a/debian/patches/CVE-2013-1441.patch b/debian/patches/CVE-2013-1441.patch
new file mode 100644 (file)
index 0000000..0d93def
--- /dev/null
@@ -0,0 +1,23 @@
+Description: exactimage: DoS, econvert crashes
+ setjmp must be called before decoding an image using dcraw because
+ it uses longjmp after an error.
+Author: Sven Eckelmann <sven@narfation.org>
+
+---
+diff --git a/codecs/dcraw.cc b/codecs/dcraw.cc
+index 4fad376cf099a62497f4261d17db61fb4a513c60..9d21c49528fc2d65a6ef78ad1c8121aa886a453c 100644
+--- a/codecs/dcraw.cc
++++ b/codecs/dcraw.cc
+@@ -161,7 +161,11 @@ int DCRAWCodec::readImage (std::istream* stream, Image& im, const std::string& d
+   if (use_camera_matrix < 0)
+       use_camera_matrix = use_camera_wb;
+-  
++
++  // TODO: cleanup on failure
++  if (setjmp (failure))
++    return false;
++
+   identify();
+   
+   if (!is_raw)
index c3e285b..6c60931 100644 (file)
@@ -9,3 +9,4 @@ verbose_build.patch
 decode_before_read_stride.patch
 gcc_48_dcraw_infinite_loop.patch
 CVE-2013-1438.patch
+CVE-2013-1441.patch