mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-04-20 11:38:34 +00:00
python3-pillow: Fix CVE-2023-50447
Pillow through 10.1.0 allows PIL.ImageMath.eval Arbitrary Code Execution via the environment parameter, a different vulnerability than CVE-2022-22817 (which was about the expression parameter). References: https://security-tracker.debian.org/tracker/CVE-2023-50447 https://github.com/python-pillow/Pillow/blob/10.2.0/CHANGES.rst Signed-off-by: Rahul Janani Pandi <RahulJanani.Pandi@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
This commit is contained in:
Rahul Janani Pandi
committed by
Armin Kuster
Armin Kuster
parent
0fffd4d422
commit
717462f811
@@ -0,0 +1,29 @@
|
||||
From 3652f431c2d8b9c10bf20b70f284d300d12e814a
|
||||
From: Andrew Murray <radarhere@users.noreply.github.com>
|
||||
Date: Sat Oct 28 14:22:39 2023 +1100
|
||||
Subject: [PATCH] python3-pillow: Simplified code
|
||||
|
||||
CVE: CVE-2023-50447
|
||||
|
||||
Upstream-Status: Backport [https://github.com/python-pillow/Pillow/commit/3652f431c2d8b9c10bf20b70f284d300d12e814a]
|
||||
|
||||
Signed-off-by: Rahul Janani Pandi <RahulJanani.Pandi@windriver.com>
|
||||
---
|
||||
src/PIL/ImageMath.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py
|
||||
index ac7d36b69..71872a3fb 100644
|
||||
--- a/src/PIL/ImageMath.py
|
||||
+++ b/src/PIL/ImageMath.py
|
||||
@@ -239,7 +239,7 @@ def eval(expression, _dict={}, **kw):
|
||||
args = ops.copy()
|
||||
args.update(_dict)
|
||||
args.update(kw)
|
||||
- for k, v in list(args.items()):
|
||||
+ for k, v in args.items():
|
||||
if hasattr(v, "im"):
|
||||
args[k] = _Operand(v)
|
||||
|
||||
--
|
||||
2.40.0
|
||||
@@ -0,0 +1,31 @@
|
||||
From 45c726fd4daa63236a8f3653530f297dc87b160a
|
||||
From: Eric Soroos <eric-github@soroos.net>
|
||||
Date: Fri Oct 27 11:21:18 2023 +0200
|
||||
Subject: [PATCH] python3-pillow: Don't allow __ or builtins in env dictionarys
|
||||
|
||||
CVE: CVE-2023-50447
|
||||
|
||||
Upstream-Status: Backport [https://github.com/python-pillow/Pillow/commit/45c726fd4daa63236a8f3653530f297dc87b160a]
|
||||
|
||||
Signed-off-by: Rahul Janani Pandi <RahulJanani.Pandi@windriver.com>
|
||||
---
|
||||
src/PIL/ImageMath.py | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py
|
||||
index 71872a3fb..923a8eeae 100644
|
||||
--- a/src/PIL/ImageMath.py
|
||||
+++ b/src/PIL/ImageMath.py
|
||||
@@ -240,6 +240,10 @@ def eval(expression, _dict={}, **kw):
|
||||
args.update(_dict)
|
||||
args.update(kw)
|
||||
for k, v in args.items():
|
||||
+ if '__' in k or hasattr(__builtins__, k):
|
||||
+ msg = f"'{k}' not allowed"
|
||||
+ raise ValueError(msg)
|
||||
+
|
||||
if hasattr(v, "im"):
|
||||
args[k] = _Operand(v)
|
||||
|
||||
--
|
||||
2.40.0
|
||||
@@ -0,0 +1,56 @@
|
||||
From 0ca3c33c59927e1c7e0c14dbc1eea1dfb2431a80
|
||||
From: Andrew Murray <radarhere@users.noreply.github.com>
|
||||
Date: Sat, 28 Oct 2023 15:58:52 +1100
|
||||
Subject: [PATCH] python3-pillow: Allow ops
|
||||
|
||||
CVE: CVE-2023-50447
|
||||
|
||||
Upstream-Status: Backport [https://github.com/python-pillow/Pillow/commit/0ca3c33c59927e1c7e0c14dbc1eea1dfb2431a80]
|
||||
|
||||
Signed-off-by: Rahul Janani Pandi <RahulJanani.Pandi@windriver.com>
|
||||
---
|
||||
Tests/test_imagemath.py | 5 +++++
|
||||
src/PIL/ImageMath.py | 9 +++++----
|
||||
2 files changed, 10 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/Tests/test_imagemath.py b/Tests/test_imagemath.py
|
||||
index fe7ac9a7a..ded8c0011 100644
|
||||
--- a/Tests/test_imagemath.py
|
||||
+++ b/Tests/test_imagemath.py
|
||||
@@ -63,6 +63,11 @@ def test_prevent_exec(expression):
|
||||
ImageMath.eval(expression)
|
||||
|
||||
|
||||
+def test_prevent_double_underscores():
|
||||
+ with pytest.raises(ValueError):
|
||||
+ ImageMath.eval("1", {"__": None})
|
||||
+
|
||||
+
|
||||
def test_logical():
|
||||
assert pixel(ImageMath.eval("not A", images)) == 0
|
||||
assert pixel(ImageMath.eval("A and B", images)) == "L 2"
|
||||
diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py
|
||||
index 923a8eeae..c14598a4c 100644
|
||||
--- a/src/PIL/ImageMath.py
|
||||
+++ b/src/PIL/ImageMath.py
|
||||
@@ -237,13 +237,14 @@ def eval(expression, _dict={}, **kw):
|
||||
|
||||
# build execution namespace
|
||||
args = ops.copy()
|
||||
- args.update(_dict)
|
||||
- args.update(kw)
|
||||
- for k, v in args.items():
|
||||
- if '__' in k or hasattr(__builtins__, k):
|
||||
+ for k in list(_dict.keys()) + list(kw.keys()):
|
||||
+ if "__" in k or hasattr(__builtins__, k):
|
||||
msg = f"'{k}' not allowed"
|
||||
raise ValueError(msg)
|
||||
|
||||
+ args.update(_dict)
|
||||
+ args.update(kw)
|
||||
+ for k, v in args.items():
|
||||
if hasattr(v, "im"):
|
||||
args[k] = _Operand(v)
|
||||
|
||||
--
|
||||
2.40.0
|
||||
@@ -0,0 +1,66 @@
|
||||
From 557ba59d13de919d04b3fd4cdef8634f7d4b3348
|
||||
From: Andrew Murray <radarhere@users.noreply.github.com>
|
||||
Date: Sat Dec 30 09:30:12 2023 +1100
|
||||
Subject: [PATCH] python3-pillow: Include further builtins
|
||||
|
||||
CVE: CVE-2023-50447
|
||||
|
||||
Upstream-Status: Backport [https://github.com/python-pillow/Pillow/commit/557ba59d13de919d04b3fd4cdef8634f7d4b3348]
|
||||
|
||||
Signed-off-by: Rahul Janani Pandi <RahulJanani.Pandi@windriver.com>
|
||||
---
|
||||
Tests/test_imagemath.py | 5 +++++
|
||||
docs/releasenotes/9.4.0.rst | 8 ++++++++
|
||||
src/PIL/ImageMath.py | 2 +-
|
||||
3 files changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Tests/test_imagemath.py b/Tests/test_imagemath.py
|
||||
index ded8c0011..124687478 100644
|
||||
--- a/Tests/test_imagemath.py
|
||||
+++ b/Tests/test_imagemath.py
|
||||
@@ -67,6 +67,11 @@ def test_prevent_double_underscores():
|
||||
with pytest.raises(ValueError):
|
||||
ImageMath.eval("1", {"__": None})
|
||||
|
||||
+def test_prevent_builtins():
|
||||
+ with pytest.raises(ValueError):
|
||||
+ ImageMath.eval("(lambda: exec('exit()'))()", {"exec": None})
|
||||
+
|
||||
+
|
||||
|
||||
def test_logical():
|
||||
assert pixel(ImageMath.eval("not A", images)) == 0
|
||||
diff --git a/docs/releasenotes/9.4.0.rst b/docs/releasenotes/9.4.0.rst
|
||||
index 0af5bc8ca..9ca7c9f6f 100644
|
||||
--- a/docs/releasenotes/9.4.0.rst
|
||||
+++ b/docs/releasenotes/9.4.0.rst
|
||||
@@ -88,6 +88,14 @@ Pillow attempted to dereference a null pointer in ``ImageFont``, leading to a
|
||||
crash. An error is now raised instead. This has been present since
|
||||
Pillow 8.0.0.
|
||||
|
||||
+Restricted environment keys for ImageMath.eval
|
||||
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
+
|
||||
+:cve:`2023-50447`: If an attacker has control over the keys passed to the
|
||||
+``environment`` argument of :py:meth:`PIL.ImageMath.eval`, they may be able to execute
|
||||
+arbitrary code. To prevent this, keys matching the names of builtins and keys
|
||||
+containing double underscores will now raise a :py:exc:`ValueError`.
|
||||
+
|
||||
Other Changes
|
||||
=============
|
||||
|
||||
diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py
|
||||
index c14598a4c..b2c50bc5b 100644
|
||||
--- a/src/PIL/ImageMath.py
|
||||
+++ b/src/PIL/ImageMath.py
|
||||
@@ -238,7 +238,7 @@ def eval(expression, _dict={}, **kw):
|
||||
# build execution namespace
|
||||
args = ops.copy()
|
||||
for k in list(_dict.keys()) + list(kw.keys()):
|
||||
- if "__" in k or hasattr(__builtins__, k):
|
||||
+ if "__" in k or hasattr(builtins, k):
|
||||
msg = f"'{k}' not allowed"
|
||||
raise ValueError(msg)
|
||||
|
||||
--
|
||||
2.40.0
|
||||
@@ -10,6 +10,10 @@ SRC_URI = "git://github.com/python-pillow/Pillow.git;branch=main;protocol=https
|
||||
file://0001-explicitly-set-compile-options.patch \
|
||||
file://run-ptest \
|
||||
file://CVE-2023-44271.patch \
|
||||
file://CVE-2023-50447-1.patch \
|
||||
file://CVE-2023-50447-2.patch \
|
||||
file://CVE-2023-50447-3.patch \
|
||||
file://CVE-2023-50447-4.patch \
|
||||
"
|
||||
SRCREV ?= "82541b6dec8452cb612067fcebba1c5a1a2bfdc8"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user