Skip to content

[3.11] gh-95778: CVE-2020-10735: Prevent DoS by very large int() #96500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gpshead merged 11 commits into from
Sep 2, 2022
Merged

[3.11] gh-95778: CVE-2020-10735: Prevent DoS by very large int() #96500

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
80dba63
Backport to 3.11 from psrt/CVE-2020-10735@ee533c68.
gpshead Aug 19, 2022
b9f4e89
Add the whatsnew entry.
gpshead Aug 19, 2022
58a4f64
Update attribution in Misc/NEWS.d
gpshead Aug 25, 2022
9e1f13d
Move int_max_str_digits out of PyInterpreterState
tiran Sep 1, 2022
4647594
Revert "Move int_max_str_digits out of PyInterpreterState"
tiran Sep 1, 2022
53e12ec
Manually add new field to abi file
tiran Sep 1, 2022
90e020b
Make the doctest actually run & fix it.
gpshead Sep 1, 2022
d6d668a
Fix the docs build.
gpshead Sep 2, 2022
dfe1922
Merge branch '3.11' into CVE-2020-10735-3.11backport
gpshead Sep 2, 2022
282052f
Rename the news file to appease the Bedevere bot.
gpshead Sep 2, 2022
c4aea14
hexadecimal spelling =)
gpshead Sep 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Manually add new field to abi file
  • Loading branch information
@tiran
tiran committed Sep 1, 2022
commit 53e12ec712b990969bc08f28da9d7f2047eb8fd8
9 changes: 6 additions & 3 deletions Doc/data/python3.11.abi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1639,7 +1639,7 @@
<elf-symbol name='_PyNotImplemented_Type' size='408' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_PyOS_ReadlineTState' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_PyParser_TokenNames' size='520' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_PyRuntime' size='166680' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_PyRuntime' size='166688' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_PySet_Dummy' size='8' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_PyWeakref_CallableProxyType' size='408' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
<elf-symbol name='_PyWeakref_ProxyType' size='408' type='object-type' binding='global-binding' visibility='default-visibility' is-defined='yes'/>
Expand Down Expand Up @@ -1825,7 +1825,7 @@
</class-decl>
<typedef-decl name='PyThreadState' type-id='type-id-9' filepath='./Include/pytypedefs.h' line='24' column='1' id='type-id-25'/>
<pointer-type-def type-id='type-id-25' size-in-bits='64' id='type-id-10'/>
<class-decl name='_is' size-in-bits='861952' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_interp.h' line='78' column='1' id='type-id-26'>
<class-decl name='_is' size-in-bits='862016' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_interp.h' line='78' column='1' id='type-id-26'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='next' type-id='type-id-11' visibility='default' filepath='./Include/internal/pycore_interp.h' line='80' column='1'/>
</data-member>
Expand Down Expand Up @@ -1971,6 +1971,9 @@
<var-decl name='callable_cache' type-id='type-id-51' visibility='default' filepath='./Include/internal/pycore_interp.h' line='177' column='1'/>
</data-member>
<data-member access='public' layout-offset-in-bits='859072'>
<var-decl name='int_max_str_digits' type-id='type-id-8' visibility='default' filepath='./Include/internal/pycore_interp.h' line='179' column='1'/>
</data-member>
<data-member access='public' layout-offset-in-bits='859136'>
<var-decl name='_initial_thread' type-id='type-id-25' visibility='default' filepath='./Include/internal/pycore_interp.h' line='192' column='1'/>
</data-member>
</class-decl>
Expand All @@ -1995,7 +1998,7 @@
<typedef-decl name='uint64_t' type-id='type-id-55' filepath='/usr/include/x86_64-linux-gnu/bits/stdint-uintn.h' line='27' column='1' id='type-id-19'/>
<type-decl name='long int' size-in-bits='64' id='type-id-53'/>
<typedef-decl name='size_t' type-id='type-id-16' filepath='/usr/lib/gcc/x86_64-linux-gnu/9/include/stddef.h' line='209' column='1' id='type-id-54'/>
<class-decl name='pyruntimestate' size-in-bits='1333440' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_runtime.h' line='59' column='1' id='type-id-56'>
<class-decl name='pyruntimestate' size-in-bits='1333504' is-struct='yes' visibility='default' filepath='./Include/internal/pycore_runtime.h' line='59' column='1' id='type-id-56'>
<data-member access='public' layout-offset-in-bits='0'>
<var-decl name='_initialized' type-id='type-id-8' visibility='default' filepath='./Include/internal/pycore_runtime.h' line='64' column='1'/>
</data-member>
Expand Down