From 13f2c5ae14901c89c38f898496102afd9daeaf6d Mon Sep 17 00:00:00 2001
From: Eric Soroos <eric-github@soroos.net>
Date: Fri, 28 Oct 2022 14:11:25 +0200
Subject: [PATCH 1/5] Prevent DOS with large SAMPLESPERPIXEL in Tiff IFD

A large value in the SAMPLESPERPIXEL tag could lead to a memory and
runtime DOS in TiffImagePlugin.py when setting up the context for
image decoding.

diff --git a/src/PIL/TiffImagePlugin.py b/src/PIL/TiffImagePlugin.py
index 04a63bd2b44..46166fc6335 100644
--- a/src/PIL/TiffImagePlugin.py
+++ b/src/PIL/TiffImagePlugin.py
@@ -257,6 +257,8 @@
     (MM, 8, (1,), 1, (8, 8, 8), ()): ("LAB", "LAB"),
 }
 
+MAX_SAMPLESPERPIXEL = max(len(key_tp[4]) for key_tp in OPEN_INFO.keys())
+
 PREFIXES = [
     b"MM\x00\x2A",  # Valid TIFF header with big-endian byte order
     b"II\x2A\x00",  # Valid TIFF header with little-endian byte order
@@ -1396,6 +1398,12 @@ def _setup(self):
             SAMPLESPERPIXEL,
             3 if self._compression == "tiff_jpeg" and photo in (2, 6) else 1,
         )
+
+        if samples_per_pixel > MAX_SAMPLESPERPIXEL:
+            # DOS check, samples_per_pixel can be a Long, and we extend the tuple below
+            logger.error("More samples per pixel than can be decoded: %s", samples_per_pixel)
+            raise SyntaxError("Invalid value for samples per pixel")
+
         if samples_per_pixel < bps_actual_count:
             # If a file has more values in bps_tuple than expected,
             # remove the excess.

724471cf43d1c95b69d1b81'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/clojure.scm'>
<input type='hidden' name='id' value='e0c6c18371e4b7029724471cf43d1c95b69d1b81'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=e0c6c18371e4b7029724471cf43d1c95b69d1b81'>root</a>/<a href='/guix/log/gnu?id=e0c6c18371e4b7029724471cf43d1c95b69d1b81'>gnu</a>/<a href='/guix/log/gnu/packages?id=e0c6c18371e4b7029724471cf43d1c95b69d1b81'>packages</a>/<a href='/guix/log/gnu/packages/clojure.scm?id=e0c6c18371e4b7029724471cf43d1c95b69d1b81'>clojure.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/clojure.scm?id=e0c6c18371e4b7029724471cf43d1c95b69d1b81&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-02-10 17:45:38 +0100'>2019-02-10</span></td><td><a href='/guix/commit/gnu/packages/clojure.scm?id=99631313e2487c1ea853ee2e2e74a848113ed490'>gnu: clojure-tools-macro: Don't use unstable tarball.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/clojure.scm (clojure-tools-macro)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-02-10 17:45:38 +0100'>2019-02-10</span></td><td><a href='/guix/commit/gnu/packages/clojure.scm?id=62dbf78b65424bf8c03a47338bcfba1fa5786246'>gnu: clojure-algo-monads: Don't use unstable tarball.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/clojure.scm (clojure-algo-monads)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-02-10 17:45:38 +0100'>2019-02-10</span></td><td><a href='/guix/commit/gnu/packages/clojure.scm?id=85e0827d909ff352ee8f56ccb740a7d5913e560e'>gnu: clojure-algo-generic: Don't use unstable tarball.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/clojure.scm (clojure-algo-generic)[source]: Use GIT-FETCH and
GIT-FILE-NAME.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2019-01-29 10:59:06 +0100'>2019-01-29</span></td><td><a href='/guix/commit/gnu/packages/clojure.scm?id=9e532ae22a2064298dbfbd45c0fa07e290520818'>gnu: clojure: Update to 1.10.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/clojure.scm (clojure): Update to 1.10.0.
[source]: Use 'git-fetch'.
</span></span></td><td>Mathieu Lirzin</td></tr>
<tr><td><span title='2018-11-24 15:20:51 +0100'>2018-11-24</span></td><td><a href='/guix/commit/gnu/packages/clojure.scm?id=96cfa168e50c3e61ba83899ef25808f0066fff72'>gnu: clojure: Move to new clojure.scm.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/local.mk (clojure): Include new clojure.scm.
* gnu/packages/clojure.scm: Add clojure, clojure-algo-generic,
  clojure-algo-monads, clojure-core-match, clojure-instaparse,
  clojure-tools-macro.
* gnu/packages/lisp.scm: Remove clojure, clojure-algo-generic,
  clojure-algo-monads, clojure-core-match, clojure-instaparse,
  clojure-tools-macro.
</span></span></td><td>Pierre Neidhardt</td></tr>