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-102179: Fix os.dup2() error reporting for negative fds #102180

Merged
merged 3 commits into from
Mar 4, 2023
Merged

gh-102179: Fix os.dup2() error reporting for negative fds #102180

merged 3 commits into from
Mar 4, 2023

Conversation

izbyshev
Copy link
Contributor

@izbyshev izbyshev commented Feb 23, 2023 •
edited by bedevere-bot
Loading

A remnant of old code manually checks the sign of fds, but doesn't set errno before raising OSError:

>>> os.dup2(-1, 0)
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  OSError: [Errno 0] Error

Remove the manual check altogether: the C library functions used to implement os.dup2() check fd validity anyway.

@izbyshev
pythongh-102179: Fix os.dup2() error reporting for negative fds
411107d 
A remnant of old code manually checks the sign of fds, but doesn't set
errno before raising OSError:
```
>>> os.dup2(-1, 0)
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
  OSError: [Errno 0] Error
```
Remove the manual check altogether: the C library functions used to
implement os.dup2() check fd validity anyway.
@bedevere-bot bedevere-bot mentioned this pull request Feb 23, 2023
Closed
@arhadthedev arhadthedev added the extension-modules C modules in the Modules dir label Feb 25, 2023
@kumaraditya303 kumaraditya303 self-assigned this Mar 3, 2023
@kumaraditya303 kumaraditya303 added the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Mar 3, 2023
@bedevere-bot
Copy link

🤖 New build scheduled with the buildbot fleet by @kumaraditya303 for commit 01df936 🤖

If you want to schedule another build, you need to add the 🔨 test-with-buildbots label again.

@bedevere-bot bedevere-bot removed the 🔨 test-with-buildbots Test PR w/ buildbots; report in status section label Mar 3, 2023
@kumaraditya303 kumaraditya303 added needs backport to 3.10 only security fixes needs backport to 3.11 only security fixes labels Mar 3, 2023
@kumaraditya303
Copy link
Contributor

Remove the manual check altogether: the C library functions used to implement os.dup2() check fd validity anyway.

@izbyshev Looks like on wasm this check is not implemented. https://buildbot.python.org/all/#/builders/1060/builds/378/steps/10/logs/stdio

@izbyshev
Copy link
Contributor Author

izbyshev commented Mar 4, 2023

@izbyshev Looks like on wasm this check is not implemented. https://buildbot.python.org/all/#/builders/1060/builds/378/steps/10/logs/stdio

@kumaraditya303 That's interesting. It seems OSError is raised with E2BIG (1) instead of EBADF (8), which doesn't make sense to me. I'm not familar with WASI, but will take a look.

@izbyshev
Copy link
Contributor Author

izbyshev commented Mar 4, 2023

@kumaraditya303 I've described the situation with Emscripten in #102179 (comment).

@kumaraditya303
Copy link
Contributor

I've described the situation with Emscripten in #102179 (comment).

Okay, thanks for investigating this!

@kumaraditya303 kumaraditya303 merged commit c2bd55d into python:main Mar 4, 2023
@miss-islington
Copy link
Contributor

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

@miss-islington
Copy link
Contributor

Sorry @izbyshev and @kumaraditya303, I had trouble checking out the 3.11 backport branch.
Please retry by removing and re-adding the "needs backport to 3.11" label.
Alternatively, you can backport using cherry_picker on the command line.
cherry_picker c2bd55d26f8eb2850eb9f9026b5d7f0ed1420b65 3.11

@bedevere-bot
Copy link

GH-102419 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 Mar 4, 2023
@izbyshev @miss-islington
pythongh-102179: Fix os.dup2 error reporting for negative fds (pyth…
9f6df8c 
…onGH-102180)

(cherry picked from commit c2bd55d)

Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>
@bedevere-bot bedevere-bot removed the needs backport to 3.10 only security fixes label Mar 4, 2023
@kumaraditya303 kumaraditya303 added needs backport to 3.11 only security fixes and removed needs backport to 3.11 only security fixes labels Mar 4, 2023
@miss-islington
Copy link
Contributor

Thanks @izbyshev for the PR, and @kumaraditya303 for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11.
🐍🍒⛏🤖 I'm not a witch! I'm not a witch!

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Mar 4, 2023
@izbyshev @miss-islington
pythongh-102179: Fix os.dup2 error reporting for negative fds (pyth…
4ae023d 
…onGH-102180)

(cherry picked from commit c2bd55d)

Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>
@bedevere-bot
Copy link

GH-102420 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 Mar 4, 2023
miss-islington added a commit that referenced this pull request Mar 4, 2023
@miss-islington @izbyshev
gh-102179: Fix os.dup2 error reporting for negative fds (GH-102180)
cc6ce90 
(cherry picked from commit c2bd55d)

Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>
@izbyshev izbyshev deleted the gh-102179-dup2-negative-fd branch March 4, 2023 15:18
kumaraditya303 added a commit that referenced this pull request Mar 4, 2023
@miss-islington @izbyshev @kumaraditya303
[3.10] gh-102179: Fix os.dup2 error reporting for negative fds (GH-…
925ebfb 
…102180) (#102419)

* gh-102179: Fix `os.dup2` error reporting for negative fds (GH-102180)
(cherry picked from commit c2bd55d)

Co-authored-by: Alexey Izbyshev <izbyshev@ispras.ru>
Co-authored-by: Kumar Aditya <59607654+kumaraditya303@users.noreply.github.com>
hugovk pushed a commit to hugovk/cpython that referenced this pull request Mar 6, 2023
@izbyshev @hugovk
pythongh-102179: Fix os.dup2 error reporting for negative fds (pyth…
1e09181 
…on#102180)
carljm added a commit to carljm/cpython that referenced this pull request Mar 6, 2023
@carljm
Merge branch 'main' into nodeaddict
33dda2a 
* main: (21 commits)
  pythongh-102192: Replace PyErr_Fetch/Restore etc by more efficient alternatives in sub interpreters module (python#102472)
  pythongh-95672: Fix versionadded indentation of get_pagesize in test.rst (pythongh-102455)
  pythongh-102416: Do not memoize incorrectly loop rules in the parser (python#102467)
  pythonGH-101362: Optimise PurePath(PurePath(...)) (pythonGH-101667)
  pythonGH-101362: Check pathlib.Path flavour compatibility at import time (pythonGH-101664)
  pythonGH-101362: Call join() only when >1 argument supplied to pathlib.PurePath() (python#101665)
  pythongh-102444: Fix minor bugs in `test_typing` highlighted by pyflakes (python#102445)
  pythonGH-102341: Improve the test function for pow (python#102342)
  Fix unused classes in a typing test (pythonGH-102437)
  pythongh-101979: argparse: fix a bug where parentheses in metavar argument of add_argument() were dropped (python#102318)
  pythongh-102356: Add thrashcan macros to filter object dealloc (python#102426)
  Move around example in to_bytes() to avoid confusion (python#101595)
  pythonGH-97546: fix flaky asyncio `test_wait_for_race_condition` test (python#102421)
  pythongh-96821: Add config option `--with-strict-overflow` (python#96823)
  pythongh-101992: update pstlib module documentation (python#102133)
  pythongh-63301: Set exit code when tabnanny CLI exits on error (python#7699)
  pythongh-101863: Fix wrong comments in EUC-KR codec (pythongh-102417)
  pythongh-102302 Micro-optimize `inspect.Parameter.__hash__` (python#102303)
  pythongh-102179: Fix `os.dup2` error reporting for negative fds (python#102180)
  pythongh-101892: Fix `SystemError` when a callable iterator call exhausts the iterator (python#101896)
  ...
carljm added a commit to carljm/cpython that referenced this pull request Mar 7, 2023
@carljm
Merge branch 'main' into inlinecomp2
ecb313c 
* main: (37 commits)
  pythongh-102192: Replace PyErr_Fetch/Restore etc by more efficient alternatives in sub interpreters module (python#102472)
  pythongh-95672: Fix versionadded indentation of get_pagesize in test.rst (pythongh-102455)
  pythongh-102416: Do not memoize incorrectly loop rules in the parser (python#102467)
  pythonGH-101362: Optimise PurePath(PurePath(...)) (pythonGH-101667)
  pythonGH-101362: Check pathlib.Path flavour compatibility at import time (pythonGH-101664)
  pythonGH-101362: Call join() only when >1 argument supplied to pathlib.PurePath() (python#101665)
  pythongh-102444: Fix minor bugs in `test_typing` highlighted by pyflakes (python#102445)
  pythonGH-102341: Improve the test function for pow (python#102342)
  Fix unused classes in a typing test (pythonGH-102437)
  pythongh-101979: argparse: fix a bug where parentheses in metavar argument of add_argument() were dropped (python#102318)
  pythongh-102356: Add thrashcan macros to filter object dealloc (python#102426)
  Move around example in to_bytes() to avoid confusion (python#101595)
  pythonGH-97546: fix flaky asyncio `test_wait_for_race_condition` test (python#102421)
  pythongh-96821: Add config option `--with-strict-overflow` (python#96823)
  pythongh-101992: update pstlib module documentation (python#102133)
  pythongh-63301: Set exit code when tabnanny CLI exits on error (python#7699)
  pythongh-101863: Fix wrong comments in EUC-KR codec (pythongh-102417)
  pythongh-102302 Micro-optimize `inspect.Parameter.__hash__` (python#102303)
  pythongh-102179: Fix `os.dup2` error reporting for negative fds (python#102180)
  pythongh-101892: Fix `SystemError` when a callable iterator call exhausts the iterator (python#101896)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kumaraditya303 kumaraditya303 kumaraditya303 approved these changes

Assignees

@kumaraditya303 kumaraditya303

Labels
extension-modules C modules in the Modules dir
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@izbyshev @bedevere-bot @kumaraditya303 @miss-islington @arhadthedev