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.

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

Jump to bottom

gh-96819: check if the length of a pipe write is not greater than 512 #96890

Merged
merged 8 commits into from
Oct 3, 2022
Merged

gh-96819: check if the length of a pipe write is not greater than 512 #96890

merged 8 commits into from
Oct 3, 2022

Conversation

saito828koki
Copy link
Contributor

@saito828koki saito828koki commented Sep 17, 2022 •
edited by bedevere-bot
Loading

@bedevere-bot
Copy link

Most changes to Python require a NEWS entry.

Please add it using the blurb_it web app or the blurb command-line tool.

DanielNoord
DanielNoord reviewed Sep 19, 2022
View reviewed changes
Lib/multiprocessing/resource_tracker.py Outdated
@@ -161,7 +161,7 @@ def unregister(self, name, rtype):
def _send(self, cmd, name, rtype):
self.ensure_running()
msg = '{0}:{1}:{2}\n'.format(cmd, name, rtype).encode('ascii')
if len(name) > 512:
if len(msg) > 512:
# posix guarantees that writes to a pipe of less than PIPE_BUF
# bytes are atomic, and that PIPE_BUF >= 512
raise ValueError('name too long')
Copy link
Contributor

Choose a reason for hiding this comment

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

Shouldn't this also be updated? ie. msg too long?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@DanielNoord
Thanks for your comment!
The error message should also be updated. I will fix it.

DanielNoord
DanielNoord approved these changes Sep 20, 2022
View reviewed changes
Misc/NEWS.d/next/Library/2022-09-17-13-15-10.gh-issue-96819.6RfqM7.rst Outdated
@@ -0,0 +1 @@
Fixed the block to guarantee that the length of a write to a pipe is not greater than PIPE_BUF
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
Fixed the block to guarantee that the length of a write to a pipe is not greater than PIPE_BUF
Fixed the check that guarantees that the length of a write to a pipe is not greater than PIPE_BUF

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you for correcting my English! Your suggestion seems to be great.

Copy link
Contributor

Choose a reason for hiding this comment

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

No worries! I struggle with writing good and short changelog entries myself many times! 😄

@JelleZijlstra
Copy link
Member

Is it possible to write a unit test for this change?

@saito828koki
Copy link
Contributor Author

Hello @JelleZijlstra ,

Thanks for your comment.
I added a test for this change. Could you review this PR?

kumaraditya303
kumaraditya303 requested changes Oct 1, 2022
View reviewed changes
Misc/NEWS.d/next/Library/2022-09-17-13-15-10.gh-issue-96819.6RfqM7.rst Outdated
@@ -0,0 +1 @@
Fixed the check that guarantees that the length of a write to a pipe is not greater than PIPE_BUF
Copy link
Contributor

Choose a reason for hiding this comment

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

Mention multiprocessing.resource_tracker in news.

@kumaraditya303 kumaraditya303 added type-bug An unexpected behavior, bug, or error needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Oct 1, 2022
@saito828koki @kumaraditya303
Modify NEWS entry
6c3afb9 
Co-authored-by: Kumar Aditya <[email protected]>
@JelleZijlstra JelleZijlstra merged commit 19ca114 into python:main Oct 3, 2022
@miss-islington
Copy link
Contributor

Thanks @saito828koki for the PR, and @JelleZijlstra for merging it 🌮🎉.. I'm working now to backport this PR to: 3.10, 3.11.
🐍🍒⛏🤖

@bedevere-bot
Copy link

GH-97745 is a backport of this pull request to the 3.11 branch.

@bedevere-bot bedevere-bot removed the needs backport to 3.11 only security fixes label Oct 3, 2022
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 3, 2022
@saito828koki @miss-islington
pythongh-96819: multiprocessing.resource_tracker: check if length of …
cbfae61 
…pipe write <= 512 (pythonGH-96890)

Co-authored-by: Kumar Aditya <[email protected]>
(cherry picked from commit 19ca114)

Co-authored-by: Koki Saito <[email protected]>
@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Oct 3, 2022
@bedevere-bot
Copy link

GH-97746 is a backport of this pull request to the 3.10 branch.

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 3, 2022
@saito828koki @miss-islington
pythongh-96819: multiprocessing.resource_tracker: check if length of …
ade8f87 
…pipe write <= 512 (pythonGH-96890)

Co-authored-by: Kumar Aditya <[email protected]>
(cherry picked from commit 19ca114)

Co-authored-by: Koki Saito <[email protected]>
miss-islington added a commit that referenced this pull request Oct 3, 2022
@miss-islington @saito828koki
gh-96819: multiprocessing.resource_tracker: check if length of pipe w…
f595067 
…rite <= 512 (GH-96890)

Co-authored-by: Kumar Aditya <[email protected]>
(cherry picked from commit 19ca114)

Co-authored-by: Koki Saito <[email protected]>
miss-islington added a commit that referenced this pull request Oct 3, 2022
@miss-islington @saito828koki
gh-96819: multiprocessing.resource_tracker: check if length of pipe w…
c2d3f73 
…rite <= 512 (GH-96890)

Co-authored-by: Kumar Aditya <[email protected]>
(cherry picked from commit 19ca114)

Co-authored-by: Koki Saito <[email protected]>
carljm added a commit to carljm/cpython that referenced this pull request Oct 3, 2022
@carljm
Merge branch 'main' into dictwatch
e83abac 
* main: (2069 commits)
  pythongh-96512: Move int_max_str_digits setting to PyConfig (python#96944)
  pythongh-94808: Coverage: Check picklablability of calliter (python#95923)
  pythongh-94808: Add test coverage for PyObject_HasAttrString (python#96627)
  pythongh-94732: Fix KeyboardInterrupt race in asyncio run_forever() (python#97765)
  Fix typos in `bltinmodule.c`. (pythonGH-97766)
  pythongh-94808: `_PyLineTable_StartsLine` was not used (pythonGH-96609)
  pythongh-97681: Remove Tools/demo/ directory (python#97682)
  Fix typo in unittest docs (python#97742)
  pythongh-97728: Argument Clinic: Fix uninitialized variable in the Py_UNICODE converter (pythonGH-97729)
  pythongh-95913: Fix PEP number in PEP 678 What's New ref label (python#97739)
  pythongh-95913: Copyedit/improve New Modules What's New section (python#97721)
  pythongh-97740: Fix bang in Sphinx C domain ref target syntax (python#97741)
  pythongh-96819: multiprocessing.resource_tracker: check if length of pipe write <= 512 (python#96890)
  pythongh-97706: multiprocessing tests: Delete unused variable `rand` (python#97707)
  pythonGH-85447: Clarify docs about awaiting future multiple times (python#97738)
  [docs] Update logging cookbook with recipe for using a logger like an output… (pythonGH-97730)
  pythongh-97607: Fix content parsing in the impl-detail reST directive (python#97652)
  pythongh-95975: Move except/*/finally ref labels to more precise locations (python#95976)
  pythongh-97591: In `Exception.__setstate__()` acquire strong references before calling `tp_hash` slot (python#97700)
  pythongh-95588: Drop the safety claim from `ast.literal_eval` docs. (python#95919)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DanielNoord DanielNoord DanielNoord approved these changes

@kumaraditya303 kumaraditya303 kumaraditya303 approved these changes

@JelleZijlstra JelleZijlstra JelleZijlstra approved these changes

Assignees
No one assigned
Labels
type-bug An unexpected behavior, bug, or error
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@saito828koki @bedevere-bot @JelleZijlstra @miss-islington @DanielNoord @kumaraditya303