Fix dup2 when newfd is invalid #22048
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sbc100
force-pushed
the
fix_dup2
branch
2 times, most recently
from
2d88f24 to
f354dab
Compare
kripken
reviewed
Jun 3, 2024
kripken
reviewed
Jun 3, 2024
| if (old.fd === newfd) return -{{{ cDefs.EINVAL }}}; | ||
| // Check newfd is within range of valid open file descriptors. | ||
| if (newfd < 0 || newfd > 1024) return -{{{ cDefs.EBADF }}}; | ||
| var existing = FS.getStream(newfd); |
Member
There was a problem hiding this comment.
Actually, shouldn't this line error if newfd is invalid? That would be a more precise check than the maximum id of an fd.
Collaborator
Author
There was a problem hiding this comment.
FS.getStream() returns undefined is the stream is not currently open its not supposed to throw an error. For that we have FS.getStreamChecked() but we don't want to use that here since we want to allows for the case where newfs is not open.
I think this is a reasonable place to do that check since this is the only place where the user can supply "proposed" file descriptor that is not already open (AFAIK).
kripken
approved these changes
Jun 3, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes: #22040