Skip to content

/ cpython

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.

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

Jump to bottom

bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded #21297

Merged
merged 6 commits into from Jul 6, 2020
Merged

bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded #21297

merged 6 commits into from Jul 6, 2020
+147 −134

Conversation

@zooba
Copy link
Member

@zooba zooba commented Jul 3, 2020 •
edited

Fixes CVE-2020-15523

https://bugs.python.org/issue29778
@zooba
bpo-29778: Ensure python3.dll is loaded from correct locations when P…
Loading status checks…
7f7de20 
…ython is embedded.
@zooba zooba requested a review from python/windows-team as a code owner Jul 3, 2020
@zooba
Copy link
Member Author

@zooba zooba commented Jul 3, 2020

I believe there's just one more test to fix, which I'll get to later tonight.
zooba added 2 commits Jul 3, 2020
@zooba
Fix test
Loading status checks…
0099c82
@zooba
Don't fail deleting absent keys
Loading status checks…
7467fb4
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jul 3, 2020

GH-21298 is a backport of this pull request to the 3.7 branch.
@zooba
Remove testing code
Loading status checks…
ced9541
@zooba zooba requested a review from vstinner Jul 3, 2020
@vstinner
vstinner reviewed Jul 3, 2020
View changes
Lib/test/test_embed.py Show resolved Hide resolved
Python/initconfig.c Outdated Show resolved Hide resolved
zooba added 2 commits Jul 3, 2020
@zooba
Move python3.dll checks entirely into test code
Loading status checks…
da59c80
@zooba
Add CVE number to NEWS
Loading status checks…
1618272
@zooba zooba merged commit dcbaa1b into python:master Jul 6, 2020
10 checks passed
10 checks passed
Docs
Details
Check for source changes
Details
Windows (x86)
Details
Windows (x64)
Details
macOS
Details
Ubuntu
Details
Azure Pipelines PR #20200706.12 succeeded
Details
bedevere/issue-number Issue number 29778 found
Details
bedevere/news News entry found in Misc/NEWS.d
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@miss-islington
Copy link
Contributor

@miss-islington miss-islington commented Jul 6, 2020

Thanks @zooba for the PR 🌮🎉.. I'm working now to backport this PR to: 3.8, 3.9.
🐍🍒⛏🤖
miss-islington added a commit to miss-islington/cpython that referenced this pull request Jul 6, 2020
@zooba @miss-islington
bpo-29778: Ensure python3.dll is loaded from correct locations when P…
44c5ef7 
…ython is embedded (pythonGH-21297)

Also enables using debug build of `python3_d.dll`
Reference: CVE-2020-15523
(cherry picked from commit dcbaa1b)

Co-authored-by: Steve Dower <steve.dower@python.org>
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jul 6, 2020

GH-21351 is a backport of this pull request to the 3.9 branch.
@bedevere-bot
Copy link

@bedevere-bot bedevere-bot commented Jul 6, 2020

GH-21352 is a backport of this pull request to the 3.8 branch.
miss-islington added a commit to miss-islington/cpython that referenced this pull request Jul 6, 2020
@zooba @miss-islington
bpo-29778: Ensure python3.dll is loaded from correct locations when P…
227b582 
…ython is embedded (pythonGH-21297)

Also enables using debug build of `python3_d.dll`
Reference: CVE-2020-15523
(cherry picked from commit dcbaa1b)

Co-authored-by: Steve Dower <steve.dower@python.org>
@zooba zooba deleted the zooba:bpo29778 branch Jul 6, 2020
miss-islington added a commit that referenced this pull request Jul 6, 2020
@miss-islington @zooba
bpo-29778: Ensure python3.dll is loaded from correct locations when P…
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
4981fe3 
…ython is embedded (GH-21297)

Also enables using debug build of `python3_d.dll`
Reference: CVE-2020-15523
(cherry picked from commit dcbaa1b)

Co-authored-by: Steve Dower <steve.dower@python.org>
ambv pushed a commit that referenced this pull request Jul 6, 2020
@miss-islington @zooba
bpo-29778: Ensure python3.dll is loaded from correct locations when P…
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
aa7f775 
…ython is embedded (GH-21297) (GH-21352)

Also enables using debug build of `python3_d.dll`
Reference: CVE-2020-15523
(cherry picked from commit dcbaa1b)

Co-authored-by: Steve Dower <steve.dower@python.org>
ned-deily pushed a commit that referenced this pull request Jul 6, 2020
@zooba
[3.7] bpo-29778: Ensure python3.dll is loaded from correct locations …
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
Loading status checks…
110dd15 
…when Python is embedded (GH-21297) (#21298)

* bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded.

* Add CVE number
J-Arun-Mani added a commit to J-Arun-Mani/cpython that referenced this pull request Jul 21, 2020
@zooba @J-Arun-Mani
bpo-29778: Ensure python3.dll is loaded from correct locations when P…
22ddf85 
…ython is embedded (pythonGH-21297)

Also enables using debug build of `python3_d.dll`
Reference: CVE-2020-15523
larryhastings pushed a commit that referenced this pull request Aug 4, 2020
@zooba
[3.5] bpo-29778: Ensure python3.dll is loaded from correct locations …
Verified
This commit was created on GitHub.com and signed with a verified signature using GitHub’s key.
GPG key ID: 4AEE18F83AFDEB23 Learn about signing commits
f205f10 
…when Python is embedded (GH-21297) (#21377)

bpo-29778: Ensure python3.dll is loaded from correct locations when Python is embedded.
chrisburr added a commit to chrisburr/cpython that referenced this pull request Dec 9, 2020
@zooba @chrisburr
bpo-29778: Ensure python3.dll is loaded from correct locations when P…
51b2d8d 
…ython is embedded (pythonGH-21297)

Also enables using debug build of `python3_d.dll`
Reference: CVE-2020-15523
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vstinner vstinner

@python/windows-team windows-team

Assignees
No one assigned
Labels
CLA signed OS-windows type-bugfix type-security
Projects
None yet
Milestone
No milestone
Linked issues

Successfully merging this pull request may close these issues.

None yet

5 participants
@zooba @bedevere-bot @miss-islington @vstinner @the-knights-who-say-ni
You can’t perform that action at this time.