Skip to content
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

gh-113977, gh-120754: Remove unbounded reads from zipfile #122101

Merged
merged 6 commits into from
Nov 3, 2024

Conversation

cmaloney
Copy link
Contributor

@cmaloney cmaloney commented Jul 21, 2024

Read without a size may read an unbounded amount of data + allocate unbounded size buffers. Move to capped size reads to prevent potential issues.

This is a followup #121593 (comment). I don't think this needs a separate news entry.

Read without a size may read an unbounded amount of data + allocate
unbounded size buffers. Move to capped size reads to prevent potential
issues.
@picnixz
Copy link
Contributor

picnixz commented Jul 22, 2024

Ah maybe not a skip news actually. I'll leave the decision to someone else.

@picnixz picnixz removed the skip news label Jul 22, 2024
Lib/zipfile/__init__.py Outdated Show resolved Hide resolved
Lib/zipfile/__init__.py Outdated Show resolved Hide resolved
Lib/zipfile/__init__.py Outdated Show resolved Hide resolved
Lib/zipfile/__init__.py Outdated Show resolved Hide resolved
cmaloney and others added 2 commits July 22, 2024 11:33
Co-authored-by: Daniel Hillier <[email protected]>
Co-authored-by: Daniel Hillier <[email protected]>
cmaloney and others added 2 commits July 22, 2024 19:16
The seek just before this _should_ result in this read hitting EOF here or getting less bytes.

Co-authored-by: Daniel Hillier <[email protected]>
@cmaloney cmaloney changed the title GH-120754: Remove unbounded reads from zipfile gh-113977, gh-120754: Remove unbounded reads from zipfile Sep 10, 2024
@gpshead gpshead merged commit 556dc9b into python:main Nov 3, 2024
40 checks passed
@gpshead gpshead added needs backport to 3.12 bug and security fixes needs backport to 3.13 bugs and security fixes labels Nov 3, 2024
@miss-islington-app
Copy link

Thanks @cmaloney for the PR, and @gpshead for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Thanks @cmaloney for the PR, and @gpshead for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 3, 2024
…pythonGH-122101)

pythonGH-113977, pythonGH-120754: Remove unbounded reads from zipfile

Read without a size may read an unbounded amount of data + allocate
unbounded size buffers. Move to capped size reads to prevent potential
issues.

(cherry picked from commit 556dc9b)

Co-authored-by: Cody Maloney <[email protected]>
Co-authored-by: Daniel Hillier <[email protected]>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Nov 3, 2024
…pythonGH-122101)

pythonGH-113977, pythonGH-120754: Remove unbounded reads from zipfile

Read without a size may read an unbounded amount of data + allocate
unbounded size buffers. Move to capped size reads to prevent potential
issues.

(cherry picked from commit 556dc9b)

Co-authored-by: Cody Maloney <[email protected]>
Co-authored-by: Daniel Hillier <[email protected]>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Nov 3, 2024

GH-126347 is a backport of this pull request to the 3.12 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Nov 3, 2024
@bedevere-app
Copy link

bedevere-app bot commented Nov 3, 2024

GH-126348 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Nov 3, 2024
@cmaloney cmaloney deleted the cmaloney/zipfile_tweaks branch November 3, 2024 05:46
gpshead pushed a commit that referenced this pull request Nov 3, 2024
…122101) (#126347)

gh-113977, gh-120754: Remove unbounded reads from zipfile (GH-122101)

GH-113977, GH-120754: Remove unbounded reads from zipfile

Read without a size may read an unbounded amount of data + allocate
unbounded size buffers. Move to capped size reads to prevent potential
issues.

(cherry picked from commit 556dc9b)

Co-authored-by: Cody Maloney <[email protected]>
Co-authored-by: Daniel Hillier <[email protected]>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
gpshead pushed a commit that referenced this pull request Nov 3, 2024
…122101) (#126348)

gh-113977, gh-120754: Remove unbounded reads from zipfile (GH-122101)

GH-113977, GH-120754: Remove unbounded reads from zipfile

Read without a size may read an unbounded amount of data + allocate
unbounded size buffers. Move to capped size reads to prevent potential
issues.

(cherry picked from commit 556dc9b)

Co-authored-by: Cody Maloney <[email protected]>
Co-authored-by: Daniel Hillier <[email protected]>
Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants