487b256c7e
patches taken from the inofficial git mirror of the upstream repository vadz/libtiff on github. Revisions: 4d4fa0b68ae9ae038959ee4f69ebe288ec892f06 fe8d7165956b88df4837034a9161dc5fd20cf67a 6173a57d39e04d68b139f8c1aa499a24dbe74ba1 Fixes CVE-2016-10095, CVE-2017-9147, CVE-2017-9936 and CVE-2017-9936. Closes: #6973 [via git-merge-pr]
141 lines
3.9 KiB
Diff
141 lines
3.9 KiB
Diff
diff --git a/libtiff/tif_dir.h b/libtiff/tif_dir.h
|
|
index e12b44b2..5206be49 100644
|
|
--- libtiff/tif_dir.h
|
|
+++ libtiff/tif_dir.h
|
|
@@ -291,6 +291,7 @@ struct _TIFFField {
|
|
extern int _TIFFMergeFields(TIFF*, const TIFFField[], uint32);
|
|
extern const TIFFField* _TIFFFindOrRegisterField(TIFF *, uint32, TIFFDataType);
|
|
extern TIFFField* _TIFFCreateAnonField(TIFF *, uint32, TIFFDataType);
|
|
+extern int _TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t tag);
|
|
|
|
#if defined(__cplusplus)
|
|
}
|
|
diff --git a/libtiff/tif_dirinfo.c b/libtiff/tif_dirinfo.c
|
|
index 0c8ef424..97c0df05 100644
|
|
--- libtiff/tif_dirinfo.c
|
|
+++ libtiff/tif_dirinfo.c
|
|
@@ -956,6 +956,109 @@ TIFFMergeFieldInfo(TIFF* tif, const TIFFFieldInfo info[], uint32 n)
|
|
return 0;
|
|
}
|
|
|
|
+int
|
|
+_TIFFCheckFieldIsValidForCodec(TIFF *tif, ttag_t tag)
|
|
+{
|
|
+ /* Filter out non-codec specific tags */
|
|
+ switch (tag) {
|
|
+ /* Shared tags */
|
|
+ case TIFFTAG_PREDICTOR:
|
|
+ /* JPEG tags */
|
|
+ case TIFFTAG_JPEGTABLES:
|
|
+ /* OJPEG tags */
|
|
+ case TIFFTAG_JPEGIFOFFSET:
|
|
+ case TIFFTAG_JPEGIFBYTECOUNT:
|
|
+ case TIFFTAG_JPEGQTABLES:
|
|
+ case TIFFTAG_JPEGDCTABLES:
|
|
+ case TIFFTAG_JPEGACTABLES:
|
|
+ case TIFFTAG_JPEGPROC:
|
|
+ case TIFFTAG_JPEGRESTARTINTERVAL:
|
|
+ /* CCITT* */
|
|
+ case TIFFTAG_BADFAXLINES:
|
|
+ case TIFFTAG_CLEANFAXDATA:
|
|
+ case TIFFTAG_CONSECUTIVEBADFAXLINES:
|
|
+ case TIFFTAG_GROUP3OPTIONS:
|
|
+ case TIFFTAG_GROUP4OPTIONS:
|
|
+ break;
|
|
+ default:
|
|
+ return 1;
|
|
+ }
|
|
+ /* Check if codec specific tags are allowed for the current
|
|
+ * compression scheme (codec) */
|
|
+ switch (tif->tif_dir.td_compression) {
|
|
+ case COMPRESSION_LZW:
|
|
+ if (tag == TIFFTAG_PREDICTOR)
|
|
+ return 1;
|
|
+ break;
|
|
+ case COMPRESSION_PACKBITS:
|
|
+ /* No codec-specific tags */
|
|
+ break;
|
|
+ case COMPRESSION_THUNDERSCAN:
|
|
+ /* No codec-specific tags */
|
|
+ break;
|
|
+ case COMPRESSION_NEXT:
|
|
+ /* No codec-specific tags */
|
|
+ break;
|
|
+ case COMPRESSION_JPEG:
|
|
+ if (tag == TIFFTAG_JPEGTABLES)
|
|
+ return 1;
|
|
+ break;
|
|
+ case COMPRESSION_OJPEG:
|
|
+ switch (tag) {
|
|
+ case TIFFTAG_JPEGIFOFFSET:
|
|
+ case TIFFTAG_JPEGIFBYTECOUNT:
|
|
+ case TIFFTAG_JPEGQTABLES:
|
|
+ case TIFFTAG_JPEGDCTABLES:
|
|
+ case TIFFTAG_JPEGACTABLES:
|
|
+ case TIFFTAG_JPEGPROC:
|
|
+ case TIFFTAG_JPEGRESTARTINTERVAL:
|
|
+ return 1;
|
|
+ }
|
|
+ break;
|
|
+ case COMPRESSION_CCITTRLE:
|
|
+ case COMPRESSION_CCITTRLEW:
|
|
+ case COMPRESSION_CCITTFAX3:
|
|
+ case COMPRESSION_CCITTFAX4:
|
|
+ switch (tag) {
|
|
+ case TIFFTAG_BADFAXLINES:
|
|
+ case TIFFTAG_CLEANFAXDATA:
|
|
+ case TIFFTAG_CONSECUTIVEBADFAXLINES:
|
|
+ return 1;
|
|
+ case TIFFTAG_GROUP3OPTIONS:
|
|
+ if (tif->tif_dir.td_compression == COMPRESSION_CCITTFAX3)
|
|
+ return 1;
|
|
+ break;
|
|
+ case TIFFTAG_GROUP4OPTIONS:
|
|
+ if (tif->tif_dir.td_compression == COMPRESSION_CCITTFAX4)
|
|
+ return 1;
|
|
+ break;
|
|
+ }
|
|
+ break;
|
|
+ case COMPRESSION_JBIG:
|
|
+ /* No codec-specific tags */
|
|
+ break;
|
|
+ case COMPRESSION_DEFLATE:
|
|
+ case COMPRESSION_ADOBE_DEFLATE:
|
|
+ if (tag == TIFFTAG_PREDICTOR)
|
|
+ return 1;
|
|
+ break;
|
|
+ case COMPRESSION_PIXARLOG:
|
|
+ if (tag == TIFFTAG_PREDICTOR)
|
|
+ return 1;
|
|
+ break;
|
|
+ case COMPRESSION_SGILOG:
|
|
+ case COMPRESSION_SGILOG24:
|
|
+ /* No codec-specific tags */
|
|
+ break;
|
|
+ case COMPRESSION_LZMA:
|
|
+ if (tag == TIFFTAG_PREDICTOR)
|
|
+ return 1;
|
|
+ break;
|
|
+
|
|
+ }
|
|
+ return 0;
|
|
+}
|
|
+
|
|
/* vim: set ts=8 sts=8 sw=8 noet: */
|
|
|
|
/*
|
|
diff --git a/libtiff/tif_dirread.c b/libtiff/tif_dirread.c
|
|
index 1d4f0b9a..f1dc3d79 100644
|
|
--- libtiff/tif_dirread.c
|
|
+++ libtiff/tif_dirread.c
|
|
@@ -3580,6 +3580,10 @@ TIFFReadDirectory(TIFF* tif)
|
|
goto bad;
|
|
dp->tdir_tag=IGNORE;
|
|
break;
|
|
+ default:
|
|
+ if( !_TIFFCheckFieldIsValidForCodec(tif, dp->tdir_tag) )
|
|
+ dp->tdir_tag=IGNORE;
|
|
+ break;
|
|
}
|
|
}
|
|
}
|