-
Notifications
You must be signed in to change notification settings - Fork 307
fix(libc): correct privilege drop order and sentinel in js_os_exec #1487
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
Open
andreasrosdal
wants to merge
1
commit into
quickjs-ng:master
Choose a base branch
from
nordstjernen-web:claude/sec-os-exec-privdrop
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+13
−5
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -3580,7 +3580,8 @@ static JSValue js_os_exec(JSContext *ctx, JSValueConst this_val, | |||||||||||
| bool block_flag = true, use_path = true; | ||||||||||||
| static const char *std_name[3] = { "stdin", "stdout", "stderr" }; | ||||||||||||
| int std_fds[3]; | ||||||||||||
| uint32_t uid = -1, gid = -1; | ||||||||||||
| uint32_t uid = 0, gid = 0; | ||||||||||||
| bool uid_set = false, gid_set = false; | ||||||||||||
| int ngroups = -1; | ||||||||||||
| gid_t groups[64]; | ||||||||||||
|
|
||||||||||||
|
|
@@ -3675,6 +3676,7 @@ static JSValue js_os_exec(JSContext *ctx, JSValueConst this_val, | |||||||||||
| JS_FreeValue(ctx, val); | ||||||||||||
| if (ret) | ||||||||||||
| goto exception; | ||||||||||||
| uid_set = true; | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| val = JS_GetPropertyStr(ctx, options, "gid"); | ||||||||||||
|
|
@@ -3685,6 +3687,7 @@ static JSValue js_os_exec(JSContext *ctx, JSValueConst this_val, | |||||||||||
| JS_FreeValue(ctx, val); | ||||||||||||
| if (ret) | ||||||||||||
| goto exception; | ||||||||||||
| gid_set = true; | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| val = JS_GetPropertyStr(ctx, options, "groups"); | ||||||||||||
|
|
@@ -3755,16 +3758,21 @@ static JSValue js_os_exec(JSContext *ctx, JSValueConst this_val, | |||||||||||
| if (chdir(cwd) < 0) | ||||||||||||
| _exit(127); | ||||||||||||
| } | ||||||||||||
| /* Drop privileges in the correct order: supplementary groups and the | ||||||||||||
| primary gid must change before setuid(), because setuid(non-root) | ||||||||||||
| strips the capability needed for setgroups()/setgid() to succeed. | ||||||||||||
| Track "was set" with explicit bools instead of a (uint32_t)-1 | ||||||||||||
| sentinel, which collided with the legitimate value 0xFFFFFFFF. */ | ||||||||||||
|
Comment on lines
+3761
to
+3765
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It's got that waffling LLM quality to it and I don't like seeing that in code I have to look at.
Suggested change
|
||||||||||||
| if (ngroups != -1) { | ||||||||||||
| if (setgroups(ngroups, groups) < 0) | ||||||||||||
| _exit(127); | ||||||||||||
| } | ||||||||||||
| if (uid != -1) { | ||||||||||||
| if (setuid(uid) < 0) | ||||||||||||
| if (gid_set) { | ||||||||||||
| if (setgid(gid) < 0) | ||||||||||||
| _exit(127); | ||||||||||||
| } | ||||||||||||
| if (gid != -1) { | ||||||||||||
| if (setgid(gid) < 0) | ||||||||||||
| if (uid_set) { | ||||||||||||
| if (setuid(uid) < 0) | ||||||||||||
| _exit(127); | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
|
|
||||||||||||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can leave
uidandgiduninitialized, that way the compiler hopefully complains if we use them without initializing them first. Or does it give off false negatives?The names
uid_setandgid_setimply the action is already done. A better name isdo_setuidormust_setuidor something along those lines.