[3.11] gh-95778: CVE-2020-10735: Prevent DoS by very large int() #96500
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Co-authored-by: Christian Heimes <christian@python.org>
Abigail does not like the fact that `PyInterpreterState` has changed
size and some fields have been moved around. Even placing
`int_max_str_digits` after `_initial_thread` does not make her happy.
Let's move the field out ouf the state and make the setting a
process-wide global. It's ugly, but better ugly than breaking somebody's
code.
```
[C]'function void PyEval_AcquireThread(PyThreadState*)' at ceval.c:452:1 has some indirect sub-type changes:
parameter 1 of type 'PyThreadState*' has sub-type changes:
in pointed to type 'typedef PyThreadState' at pytypedefs.h:24:1:
underlying type 'struct _ts' at pystate.h:82:1 changed:
type size hasn't changed
1 data member changes (2 filtered):
type of 'PyInterpreterState* _ts::interp' changed:
in pointed to type 'typedef PyInterpreterState' at pytypedefs.h:25:1:
underlying type 'struct _is' at pycore_interp.h:78:1 changed:
type size changed from 861952 to 862016 (in bits)
1 data member insertion:
'int _is::int_max_str_digits', at offset 859072 (in bits) at pycore_interp.h:179:1
2 data member changes (3 filtered):
type of 'pyruntimestate* _is::runtime' changed:
in pointed to type 'struct pyruntimestate' at pycore_runtime.h:59:1:
type size changed from 1333440 to 1333504 (in bits)
1 data member changes (2 filtered):
'PyThreadState _is::_initial_thread' offset changed from 859072 to 859136 (in bits) (by +64 bits)
```
This reverts commit 9e1f13d.
tiran
added
the
🔨 test-with-buildbots
bedevere-bot
removed
the
🔨 test-with-buildbots
gpshead
requested review from
terryjreedy,
rhettinger,
pablogsal and
lysnikolaou
as code owners
njsmith
reviewed
Sep 2, 2022
|
bugfix incoming #96537 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Integer to and from text conversions via CPython's bignum
inttype is not safe against denial of service attacks due to malicious input. Very large input strings with hundred thousands of digits can consume several CPU seconds.This PR comes fresh from a pile of work done in our private PSRT security response team repo.
This backports #96499 aka 511ca94
Signed-off-by: Christian Heimes [Red Hat] christian@python.org
Tons-of-polishing-up-by: Gregory P. Smith [Google] greg@krypto.org
Reviews via the private PSRT repo via many others (see the NEWS entry in the PR).
I wrote up a one pager for the release managers.