e773f2
From c558baf01a97aed376a67ff4641f1c3c864ae3f0 Mon Sep 17 00:00:00 2001
e773f2
From: Lumir Balhar <lbalhar@redhat.com>
e773f2
Date: Thu, 8 Apr 2021 17:55:26 +0200
e773f2
Subject: [PATCH 1/4] CVE-2021-25290
e773f2
e773f2
---
e773f2
 src/libImaging/TiffDecode.c | 5 +++++
e773f2
 1 file changed, 5 insertions(+)
e773f2
e773f2
diff --git a/src/libImaging/TiffDecode.c b/src/libImaging/TiffDecode.c
e773f2
index f292da3..d17b557 100644
e773f2
--- a/src/libImaging/TiffDecode.c
e773f2
+++ b/src/libImaging/TiffDecode.c
e773f2
@@ -36,6 +36,11 @@ tsize_t _tiffReadProc(thandle_t hdata, tdata_t buf, tsize_t size) {
e773f2
 	TRACE(("_tiffReadProc: %d \n", (int)size));
e773f2
 	dump_state(state);
e773f2
 
e773f2
+    if (state->loc > state->eof) {
e773f2
+        TIFFError("_tiffReadProc", "Invalid Read at loc %d, eof: %d", state->loc, state->eof);
e773f2
+        return 0;
e773f2
+    }
e773f2
+
e773f2
 	to_read = min(size, min(state->size, (tsize_t)state->eof) - (tsize_t)state->loc);
e773f2
 	TRACE(("to_read: %d\n", (int)to_read));
e773f2
 
e773f2
-- 
e773f2
2.30.2
e773f2