◐ Shell
reader mode source ↗
Skip to content

gh-78724: raise RuntimeError's when calling methods on non-ready Struct()'s#143643

Merged
serhiy-storchaka merged 14 commits into
python:mainfrom
skirpichev:deprecate-struct-init/78724
Jan 11, 2026
Merged

gh-78724: raise RuntimeError's when calling methods on non-ready Struct()'s#143643
serhiy-storchaka merged 14 commits into
python:mainfrom
skirpichev:deprecate-struct-init/78724

Conversation

@skirpichev

@skirpichev skirpichev commented Jan 10, 2026 •
edited
Loading

Copy link
Copy Markdown
Member

@skirpichev
pythongh-143379: fix UAF in struct.Struct.pack() when object modified… …
a1c2603 
… by dunder methods
@skirpichev
Merge branch 'master' into fix-uaf-s_pack_internal/143379
716e28c
@skirpichev
address review: implement a different solution with a mutex flag …
e611953 
Now modification of the Struct() while packing trigger a RuntimeError
@skirpichev
+ clean the mess
ab62167
@skirpichev
pythongh-78724: raise RuntimeError's when calling methods on non-read… …
3b18427 
…y Struct()'s

Calling the ``Struct.__new__()`` dunder without required argument now is
deprecated.  Calling the ``Struct.__init__()`` dunder method on
initialized object now also is deprecated.
@bedevere-app bedevere-app Bot mentioned this pull request Jan 10, 2026
Closed
@skirpichev skirpichev mentioned this pull request Jan 10, 2026
Closed
@skirpichev

This comment was marked as outdated.

Sign in to view
@skirpichev skirpichev marked this pull request as ready for review January 10, 2026 07:55
serhiy-storchaka
serhiy-storchaka reviewed Jan 10, 2026
View reviewed changes

@serhiy-storchaka serhiy-storchaka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

This issue is relatively independed from the concurrent packing issue, so I suggest fir it separately. We should not add deprecation in maintained versions, so I suggest to only leave checks that Struct was initialized, and add the deprecation in a separate PR.

prepare_s() should be rewritten so it only sets s_codes and other fields when it is successful.

@serhiy-storchaka serhiy-storchaka added needs backport to 3.13 bugs and security fixes needs backport to 3.14 bugs and security fixes labels Jan 10, 2026
@skirpichev skirpichev marked this pull request as draft January 10, 2026 10:14
@skirpichev

skirpichev commented Jan 10, 2026

Copy link
Copy Markdown
Member Author

prepare_s() should be rewritten so it only sets s_codes and other fields when it is successful.

I think it's already the case. We can move a bit s_size/s_len assignments, but as far as we interested only in s_codes - I'm not sure if it's worth. There should be no failures after codes = PyMem_Malloc(...).

@skirpichev skirpichev marked this pull request as ready for review January 10, 2026 11:45
@serhiy-storchaka

serhiy-storchaka commented Jan 10, 2026

Copy link
Copy Markdown
Member

Well, it does not matter. It would reduce the chance of race condition, but nobody should run __init__() and pack() concurrently, there are no reasons to do this, and we should not support this.

13 hidden items Load more…
@skirpichev

skirpichev commented Jan 10, 2026

Copy link
Copy Markdown
Member Author

Well, it does not matter. It would reduce the chance of race condition, but nobody should run __init__() and pack() concurrently, there are no reasons to do this, and we should not support this.

I guess this belongs to the #143382 pr thread.

serhiy-storchaka
serhiy-storchaka approved these changes Jan 11, 2026
View reviewed changes

@serhiy-storchaka serhiy-storchaka left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hide comment

LGTM. 👍

@serhiy-storchaka serhiy-storchaka enabled auto-merge (squash) January 11, 2026 15:47
Hide details View details @serhiy-storchaka serhiy-storchaka merged commit 515ae40 into python:main Jan 11, 2026
50 checks passed
@miss-islington-app

miss-islington-app Bot commented Jan 11, 2026

Copy link
Copy Markdown

Thanks @skirpichev for the PR, and @serhiy-storchaka for merging it 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Jan 11, 2026
@skirpichev @miss-islington
pythongh-78724: Raise RuntimeError's when calling methods on non-read… …
660b508 
…y Struct()'s (pythonGH-143643)

(cherry picked from commit 515ae40)

Co-authored-by: Sergey B Kirpichev <skirpichev@gmail.com>
@miss-islington-app

miss-islington-app Bot commented Jan 11, 2026

Copy link
Copy Markdown

Sorry, @skirpichev and @serhiy-storchaka, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 515ae4078dffa0b74e5e5431462c2f4fe4563ffa 3.13

@bedevere-app

bedevere-app Bot commented Jan 11, 2026

Copy link
Copy Markdown

GH-143695 is a backport of this pull request to the 3.14 branch.

@bedevere-app bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Jan 11, 2026
@skirpichev skirpichev deleted the deprecate-struct-init/78724 branch January 11, 2026 18:04
@skirpichev skirpichev self-assigned this Jan 11, 2026
@bedevere-app

bedevere-app Bot commented Jan 11, 2026

Copy link
Copy Markdown

GH-143714 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 Jan 11, 2026
@skirpichev skirpichev removed their assignment Jan 11, 2026
serhiy-storchaka pushed a commit that referenced this pull request Jan 12, 2026
@skirpichev
[3.13] gh-78724: Raise RuntimeError's when calling methods on non-rea… …
8fd4435 
…dy Struct()'s (GH-143643) (GH-143714)

(cherry picked from commit 515ae40)
reidenong pushed a commit to reidenong/cpython that referenced this pull request Jan 12, 2026
@skirpichev @reidenong
pythongh-78724: Raise RuntimeError's when calling methods on non-read… …
e3ef2fc 
…y Struct()'s (pythonGH-143643)
thunder-coding pushed a commit to thunder-coding/cpython that referenced this pull request Feb 15, 2026
@skirpichev @thunder-coding
pythongh-78724: Raise RuntimeError's when calling methods on non-read… …
3ab851b 
…y Struct()'s (pythonGH-143643)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@serhiy-storchaka serhiy-storchaka serhiy-storchaka approved these changes

Assignees

@serhiy-storchaka serhiy-storchaka

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@skirpichev @serhiy-storchaka