procstat: Fix bug with procstat compartments #2323
Merged
Conversation
This file contains 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
bsdjhb
approved these changes
Feb 12, 2025
| @@ -50,14 +50,13 @@ procstat_compartments(struct procstat *procstat, struct kinfo_proc *kipp) | |||
| xo_emit("{T:/%5s %-19s %4s %-40s}\n", "PID", "COMM", "CID", | |||
| "CNAME"); | |||
| if (procstat_getcompartments(procstat, kipp, &cccp, &ncomparts) != 0) | |||
| goto out; | |||
| return; | |||
There was a problem hiding this comment.
I think this is the only real fix FWIW. It's not unusual to say that the value of arguments passed by pointer is unchanged/undefined if a function fails. Or put another way, it is only assigned a defined value if the function succeeds and it is an error to use the value if the function fails.
There was a problem hiding this comment.
Sounds good to me to just leave the inout pointers untouched if there's an error. The diff is also smaller this way.
libprocstat is responsible for allocating the array of compartment information that is returned to the procstat command-line tool, which is responsible for freeing it. But procstat should not attempt to free the array if libprocstat returns an error. Also fixes a bug that might cause NULL to be dereferenced in libprocstat.
dpgao
force-pushed
the
c18n-procstat-fix
branch
from
d4d5110 to
a03d4c0
Compare
bsdjhb
approved these changes
Feb 12, 2025
| @@ -479,7 +479,6 @@ procstat_getcompartments(struct procstat *procstat, struct kinfo_proc *kp, | |||
| out_free: | |||
There was a problem hiding this comment.
Note that if you initialized inbuf to NULL at the start of the function you could consolidate this down to a single label (but as a followup commit if you wanted to do that).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
libprocstat is responsible for allocating the array of compartment information that is returned to the procstat command-line tool, which is responsible for freeing it. But procstat should not attempt to free the array if libprocstat returns an error.
Also fixes a bug that might cause NULL to be dereferenced in libprocstat.