Correct buffer_bytes > INT_MAX on BSD/amd64. #712
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
The sysctl vfs.bufspace returns either an int or a long, depending on the value. Large values of vfs.bufspace will result in error messages like: couldn't get meminfo: cannot allocate memory This will detect the returned data type, and cast appropriately.
mdlayher
reviewed
Oct 24, 2017
collector/sysctl_bsd.go
Outdated
| ) | ||
| } | ||
|
|
||
| if len(raw) < (C.sizeof_long) { |
There was a problem hiding this comment.
I'd feel a little better if we checked explicitly to ensure it matches the size of an integer, and then threw an error otherwise.
There was a problem hiding this comment.
Thanks, I feel better about this too. I've had short in the back of my head the whole time. And maybe this thing becomes bsdSysctlTypeSignedInteger, if it's needed.
mdlayher
reviewed
Oct 24, 2017
collector/sysctl_bsd.go
Outdated
| // Not sure this is valid for all CLongs. It is at | ||
| // least for vfs.bufspace: | ||
| // https://github.com/freebsd/freebsd/blob/releng/10.3/sys/kern/vfs_bio.c#L338 | ||
| tmpf64 = float64(*(*C.int)(unsafe.Pointer(&raw[0]))) |
There was a problem hiding this comment.
As it stands now, this will be overwritten by line 134.
collector/sysctl_bsd.go
Outdated
| // least for vfs.bufspace: | ||
| // https://github.com/freebsd/freebsd/blob/releng/10.3/sys/kern/vfs_bio.c#L338 | ||
| tmpf64 = float64(*(*C.int)(unsafe.Pointer(&raw[0]))) | ||
| break |
There was a problem hiding this comment.
The break at 131 is what stops 134 for overwriting - at least that's my intention.
There was a problem hiding this comment.
Apologies, may have misread the diff.
There was a problem hiding this comment.
Still valid. ;)
derekmarcotte
commented
Oct 24, 2017
mdlayher
reviewed
Oct 24, 2017
collector/sysctl_bsd.go
Outdated
| return 0, fmt.Errorf( | ||
| "length of bytes received from sysctl (%d) does not match expected bytes (%d)", | ||
| len(raw), | ||
| C.sizeof_long, |
collector/sysctl_bsd.go
Outdated
| return 0, err | ||
| } | ||
|
|
||
| if len(raw) != (C.sizeof_long) { |
There was a problem hiding this comment.
IMO invert this and move the return from line 152 up to reduce a level of indentation.
mdlayher
approved these changes
Oct 24, 2017
|
Not at all. Happy for the feedback! |
|
Nice, thanks! LGTM |
SuperQ
pushed a commit
that referenced
this pull request
Nov 7, 2017
* Correct buffer_bytes > INT_MAX on BSD/amd64. The sysctl vfs.bufspace returns either an int or a long, depending on the value. Large values of vfs.bufspace will result in error messages like: couldn't get meminfo: cannot allocate memory This will detect the returned data type, and cast appropriately. * Added explicit length checks per feedback. * Flatten Value() to make it easier to read. * Simplify per feedback. * Fix style. * Doc updates.
Merged
SuperQ
added a commit
that referenced
this pull request
Nov 8, 2017
* netstat: return nothing when /proc/net/snmp6 not found * Fix off by one in Linux interrupts collector (#721) * Fix off by one in Linux interrupts collector * Fix off by one in CPU column handler. * Add test. * Enable interrupts in end-to-end test. * Add and use sysReadFile in hwmon collector (#728) * xfs: expose correct fields, fix metric names * Correct buffer_bytes > INT_MAX on BSD/amd64. (#712) * Correct buffer_bytes > INT_MAX on BSD/amd64. The sysctl vfs.bufspace returns either an int or a long, depending on the value. Large values of vfs.bufspace will result in error messages like: couldn't get meminfo: cannot allocate memory This will detect the returned data type, and cast appropriately. * Added explicit length checks per feedback. * Flatten Value() to make it easier to read. * Simplify per feedback. * Fix style. * Doc updates. * Release v0.15.1 * [BUGFIX] netstat: return nothing when /proc/net/snmp6 not found #718 * [BUGFIX] Fix off by one in Linux interrupts collector #721 * [BUGFIX] Add and use sysReadFile in hwmon collector #728
oblitorum
pushed a commit
to shatteredsilicon/node_exporter
that referenced
this pull request
Apr 9, 2024
* Correct buffer_bytes > INT_MAX on BSD/amd64. The sysctl vfs.bufspace returns either an int or a long, depending on the value. Large values of vfs.bufspace will result in error messages like: couldn't get meminfo: cannot allocate memory This will detect the returned data type, and cast appropriately. * Added explicit length checks per feedback. * Flatten Value() to make it easier to read. * Simplify per feedback. * Fix style. * Doc updates.
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.
The sysctl vfs.bufspace returns either an int or a long, depending on
the value. Large values of vfs.bufspace will result in error messages
like:
couldn't get meminfo: cannot allocate memory
This will detect the returned data type, and cast appropriately.
This is an updated fix to the one provided in #710.
I suspect that there'll be more re-factoring here, if other uses show up.