Skip to content

fix: harden parsers against malformed/truncated input - #2109

Merged
shirou merged 1 commit into
masterfrom
fix/harden-parsers-against-malformed-input
Jul 2, 2026
Merged

fix: harden parsers against malformed/truncated input#2109
shirou merged 1 commit into
masterfrom
fix/harden-parsers-against-malformed-input

Conversation

@shirou

@shirou shirou commented Jul 2, 2026

Copy link
Copy Markdown
Owner

Add missing length and bounds checks so that malformed, truncated, or empty /proc files and BSD sysctl buffers return an error instead of panicking. Reachable via HOST_PROC-style overrides or transient short reads while a process is terminating.

  • process: guard splitProcStat against missing parentheses, add field-count checks in ChildrenWithContext and fillFromStatm, guard empty State value, and bounds-check OpenBSD CmdlineSlice pointers
  • mem: fix off-by-one guard in parseSwapsFile
  • disk: skip short lines in parseFieldsOnMounts
  • net: guard IOCountersByFile short files and fix processUnix off-by-one
  • cpu/load (bsd): validate sysctl buffer size before unsafe cast

Also validate caller-supplied input in public APIs to prevent argument injection and path traversal:

  • disk.SerialNumber rejects device names starting with '-' (freebsd/aix)
  • docker cgroup path rejects containerID with '/', '' or '..'

Add tests covering the malformed-input cases.

@shirou
shirou requested a review from Copilot July 2, 2026 14:23
Copilot AI reviewed Jul 2, 2026
View reviewed changes

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR hardens multiple OS-specific parsers (Linux /proc and BSD sysctl buffers) to avoid panics on malformed/truncated inputs, and adds basic validation to a few public APIs to reduce risk from caller-supplied path/argument injection.

Changes:

  • Add length/bounds checks across process/mem/disk/net parsing paths to prevent panics on malformed or short reads.
  • Validate BSD sysctl buffer sizes before unsafe casts in cpu/load implementations.
  • Add input validation for docker cgroup path construction and for disk serial-number lookup arguments; add regression tests for malformed-input cases.

Reviewed changes

Copilot reviewed 14 out of 14 changed files in this pull request and generated 5 comments.

Show a summary per file
File Description
process/process_openbsd.go Adds bounds checks when decoding kern.procargs argv pointer/string data.
process/process_linux.go Adds field-count and empty-value guards around /proc parsing to prevent panics.
process/process_linux_test.go Adds regression tests ensuring malformed /proc/[pid]/stat input doesn’t panic.
net/net_linux.go Adds short-file guard in /proc/net/dev parsing and fixes an off-by-one token-count check for unix sockets.
mem/mem_linux.go Fixes off-by-one column guards in /proc/swaps parsing to avoid panics.
mem/mem_linux_test.go Adds tests for short /proc/swaps header/data rows.
load/load_openbsd.go Validates sysctl buffer size before unsafe cast for kern.forkstat.
docker/docker_linux.go Adds validation intended to prevent traversal via caller-supplied containerID in cgroup path building.
disk/disk_linux.go Skips short/malformed mount lines in mounts parsing.
disk/disk_freebsd.go Rejects geom device names that start with - to reduce option-injection risk.
disk/disk_aix.go Rejects lscfg device names that start with - to reduce option-injection risk.
cpu/cpu_openbsd.go Validates sysctl buffer size before unsafe casts; avoids panics on short replies.
cpu/cpu_netbsd.go Validates sysctl buffer size before unsafe casts; avoids panics on short replies.
cpu/cpu_freebsd.go Validates sysctl buffer size before unsafe cast for kern.cp_time.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread process/process_openbsd.go Outdated
Comment thread process/process_openbsd.go
Comment thread process/process_linux.go
Comment thread net/net_linux.go
Comment thread docker/docker_linux.go
@shirou
fix: harden parsers against malformed/truncated input
2980769 
Add missing length and bounds checks so that malformed, truncated, or
empty /proc files and BSD sysctl buffers return an error instead of
panicking. Reachable via HOST_PROC-style overrides or transient short
reads while a process is terminating.

- process: guard splitProcStat against missing parentheses, add
  field-count checks in ChildrenWithContext and fillFromStatm, guard
  empty State value, and bounds-check OpenBSD CmdlineSlice pointers
- mem: fix off-by-one guard in parseSwapsFile
- disk: skip short lines in parseFieldsOnMounts
- net: guard IOCountersByFile short files and fix processUnix off-by-one
- cpu/load (bsd): validate sysctl buffer size before unsafe cast

Also validate caller-supplied input in public APIs to prevent argument
injection and path traversal:

- disk.SerialNumber rejects device names starting with '-' (freebsd/aix)
- docker cgroup path rejects containerID with '/', '\' or '..'

Add tests covering the malformed-input cases.
@shirou
shirou force-pushed the fix/harden-parsers-against-malformed-input branch from e9b349d to 2980769 Compare July 2, 2026 14:35
@shirou
shirou merged commit 25a6867 into master Jul 2, 2026
54 checks passed
@shirou
shirou deleted the fix/harden-parsers-against-malformed-input branch July 2, 2026 14:53
@neilpang neilpang mentioned this pull request Aug 3, 2026
Open
1 task
mergify Bot added a commit to ArcadeData/arcadedb that referenced this pull request Aug 5, 2026
@mergify
build(deps): bump the go-modules group in /e2e-go with 2 updates [ski…
797b663 
…p ci]

Bumps the go-modules group in /e2e-go with 2 updates: [github.com/moby/go-archive](https://github.com/moby/go-archive) and [github.com/shirou/gopsutil/v4](https://github.com/shirou/gopsutil).
Updates `github.com/moby/go-archive` from 0.2.1 to 0.3.2
Release notes

*Sourced from [github.com/moby/go-archive's releases](https://github.com/moby/go-archive/releases).*

> v0.3.2
> ------
>
> What's Changed
> --------------
>
> Fix a regression introduced in v0.3.0 that caused archive extraction to fail when paths traversed absolute symlinks inside the destination root, such as `var/run -> /run`. Absolute symlink targets are now resolved relative to the extraction root while relative symlink escapes remain rejected. [moby/go-archive#93](https://redirect.github.com/moby/go-archive/pull/93)
>
> **Full Changelog**: <moby/go-archive@v0.3.1...v0.3.2>
>
> v0.3.1
> ------
>
> Fixes
> -----
>
> This patch release fixes a regression introduced in v0.2.1 where archive extraction could fail when an archive omitted explicit entries for parent directories. For example, extracting `etc/dnf/` without a preceding `etc/` entry could return `mkdirat etc/dnf: no such file or directory`.
>
> This prevented affected images from being extracted. Archive extraction now creates implied parent directories for both file and directory entries.
>
> What's Changed
> --------------
>
> * archive: create implied parents for directory entries [moby/go-archive#92](https://redirect.github.com/moby/go-archive/pull/92)
> * archive: Tarballer.Go: suppress io.ErrClosedPipe logs on close [moby/go-archive#94](https://redirect.github.com/moby/go-archive/pull/94)
>
> **Full Changelog**: <moby/go-archive@v0.3.0...v0.3.1>
>
> v0.3.0
> ------
>
> Security
> --------
>
> This release fixes **CVE-2026-17106** / **[GHSA-hfg8-hc9c-6c3h](https://github.com/moby/go-archive/security/advisories/GHSA-hfg8-hc9c-6c3h)**, where a crafted tar archive could use links to cause extraction operations to create or overwrite files outside the intended destination directory.
>
> The issue affected `Unpack`, `UnpackLayer`, `Untar`, `UntarUncompressed`, and the `ApplyLayer` helpers. Users should upgrade and avoid extracting untrusted archives with earlier versions.
>
> What's Changed
> --------------
>
> * archive: harden tar extraction against path traversal [moby/go-archive#45](https://redirect.github.com/moby/go-archive/pull/45)
> * archive: do not follow reparse points in chtimes [moby/go-archive#90](https://redirect.github.com/moby/go-archive/pull/90)
> * archive: fix creation time updates on Windows [moby/go-archive#79](https://redirect.github.com/moby/go-archive/pull/79)
> * archive: minor cleanups and godoc touch-up [moby/go-archive#87](https://redirect.github.com/moby/go-archive/pull/87)
> * archive: RebaseArchiveEntries: fix archive path rebasing [moby/go-archive#43](https://redirect.github.com/moby/go-archive/pull/43)
>
> Test and CI changes
> -------------------
>
> * ci: enable dependabot for actions [moby/go-archive#81](https://redirect.github.com/moby/go-archive/pull/81)
> * archive: make breakoutErr unwrap its cause [moby/go-archive#91](https://redirect.github.com/moby/go-archive/pull/91)
> * archive: use filepath for filesystem paths in tests [moby/go-archive#80](https://redirect.github.com/moby/go-archive/pull/80)
> * archive: use filepath for filesystem paths in tests [moby/go-archive#80](https://redirect.github.com/moby/go-archive/pull/80)
>
> **Full Changelog**: <moby/go-archive@v0.2.1...v0.3.0>


Commits

* [`9e6d2c7`](moby/go-archive@9e6d2c7) Merge pull request [#93](https://redirect.github.com/moby/go-archive/issues/93) from thaJeztah/fix\_absolute\_symlinks
* [`4f6cd58`](moby/go-archive@4f6cd58) archive: resolve hardlinks through absolute symlinks
* [`e564ecc`](moby/go-archive@e564ecc) archive: resolve absolute symlinks within extraction root
* [`5bb8a45`](moby/go-archive@5bb8a45) Merge pull request [#94](https://redirect.github.com/moby/go-archive/issues/94) from thaJeztah/denoise
* [`1bec7ec`](moby/go-archive@1bec7ec) archive: Tarballer.Go: suppress io.ErrClosedPipe logs on close
* [`279fa6d`](moby/go-archive@279fa6d) Merge pull request [#92](https://redirect.github.com/moby/go-archive/issues/92) from thaJeztah/fix\_implied\_directories
* [`517985a`](moby/go-archive@517985a) archive: create implied parents for directory entries
* [`1c23372`](moby/go-archive@1c23372) Merge pull request [#43](https://redirect.github.com/moby/go-archive/issues/43) from thaJeztah/fix\_rebase\_from\_root
* [`8829a25`](moby/go-archive@8829a25) RebaseArchiveEntries: fix archive path rebasing
* [`c583b20`](moby/go-archive@c583b20) Merge pull request [#90](https://redirect.github.com/moby/go-archive/issues/90) from thaJeztah/chtimes\_nofollow
* Additional commits viewable in [compare view](moby/go-archive@v0.2.1...v0.3.2)
  
Updates `github.com/shirou/gopsutil/v4` from 4.26.6 to 4.26.7
Release notes

*Sourced from [github.com/shirou/gopsutil/v4's releases](https://github.com/shirou/gopsutil/releases).*

> v4.26.7
> -------
>
> What's Changed
> --------------
>
> ### cpu
>
> * fix: harden parsers against malformed/truncated input by [`@​shirou`](https://github.com/shirou) in [shirou/gopsutil#2109](https://redirect.github.com/shirou/gopsutil/pull/2109)
> * [cpu][windows]: compute cpu-total times from integer ticks by [`@​skartikey`](https://github.com/skartikey) in [shirou/gopsutil#2111](https://redirect.github.com/shirou/gopsutil/pull/2111)
> * [darwin][process]: fix errno handling and library lifetime on darwin by [`@​shirou`](https://github.com/shirou) in [shirou/gopsutil#2119](https://redirect.github.com/shirou/gopsutil/pull/2119)
> * [cpu][windows]: compute total counters from individual stats to handle processor groups correctly by [`@​srebhan`](https://github.com/srebhan) in [shirou/gopsutil#2125](https://redirect.github.com/shirou/gopsutil/pull/2125)
> * [cpu][windows]: harden the cpu-total computation added in [#2125](https://redirect.github.com/shirou/gopsutil/issues/2125) by [`@​shirou`](https://github.com/shirou) in [shirou/gopsutil#2128](https://redirect.github.com/shirou/gopsutil/pull/2128)
>
> ### net
>
> * fix(net): pad GetExtendedTcpTable buffer to prevent GC thrashing on Windows by [`@​HarshalPatel1972`](https://github.com/HarshalPatel1972) in [shirou/gopsutil#2108](https://redirect.github.com/shirou/gopsutil/pull/2108)
>
> ### process
>
> * process: implement Darwin IOCounters via proc\_pid\_rusage by [`@​DavRack`](https://github.com/DavRack) in [shirou/gopsutil#2117](https://redirect.github.com/shirou/gopsutil/pull/2117)
>
> ### other
>
> * feat: add psutil comparison tests for cpu, mem and load by [`@​shirou`](https://github.com/shirou) in [shirou/gopsutil#2114](https://redirect.github.com/shirou/gopsutil/pull/2114)
>
> New Contributors
> ----------------
>
> * [`@​DavRack`](https://github.com/DavRack) made their first contribution in [shirou/gopsutil#2117](https://redirect.github.com/shirou/gopsutil/pull/2117)
> * [`@​srebhan`](https://github.com/srebhan) made their first contribution in [shirou/gopsutil#2125](https://redirect.github.com/shirou/gopsutil/pull/2125)
>
> **Full Changelog**: <shirou/gopsutil@v4.26.6...v4.26.7>


Commits

* [`52a24c8`](shirou/gopsutil@52a24c8) Merge pull request [#2128](https://redirect.github.com/shirou/gopsutil/issues/2128) from shirou/feat/follow-up-2125
* [`268a953`](shirou/gopsutil@268a953) [cpu][windows]: harden the cpu-total computation added in [#2125](https://redirect.github.com/shirou/gopsutil/issues/2125)
* [`1e34da6`](shirou/gopsutil@1e34da6) Merge pull request [#2125](https://redirect.github.com/shirou/gopsutil/issues/2125) from srebhan/fix\_cpu\_windows\_total
* [`61f8802`](shirou/gopsutil@61f8802) Merge pull request [#2122](https://redirect.github.com/shirou/gopsutil/issues/2122) from shirou/dependabot/github\_actions/actions/checko...
* [`7fb4dcf`](shirou/gopsutil@7fb4dcf) Merge pull request [#2123](https://redirect.github.com/shirou/gopsutil/issues/2123) from shirou/dependabot/github\_actions/actions/setup-...
* [`ae7d91a`](shirou/gopsutil@ae7d91a) Merge pull request [#2119](https://redirect.github.com/shirou/gopsutil/issues/2119) from shirou/fix/darwin-errno-and-libcache
* [`49052a1`](shirou/gopsutil@49052a1) [darwin][process]: use a PID above PID\_MAX in the not-running tests
* [`991b238`](shirou/gopsutil@991b238) [darwin]: pass the remaining Go pointers as unsafe.Pointer on darwin
* [`b9930e2`](shirou/gopsutil@b9930e2) Merge pull request [#2124](https://redirect.github.com/shirou/gopsutil/issues/2124) from shirou/dependabot/github\_actions/actions/labele...
* [`38a01b4`](shirou/gopsutil@38a01b4) [cpu][windows]: compute total counters from individual stats to handle proces...
* Additional commits viewable in [compare view](shirou/gopsutil@v4.26.6...v4.26.7)
  
Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`.
[//]: # (dependabot-automerge-start)
[//]: # (dependabot-automerge-end)
---
Dependabot commands and options
  
You can trigger Dependabot actions by commenting on this PR:
- `@dependabot rebase` will rebase this PR
- `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it
- `@dependabot show  ignore conditions` will show all of the ignore conditions of the specified dependency
- `@dependabot ignore  major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself)
- `@dependabot ignore  minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself)
- `@dependabot ignore ` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself)
- `@dependabot unignore ` will remove all of the ignore conditions of the specified dependency
- `@dependabot unignore  ` will remove the ignore condition of the specified dependency and ignore conditions
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

Copilot code review Copilot
Copilot review effort
Applies to this pull request for everyone.Learn more about Copilot code review.
Copilot left review comments

Assignees

No one assigned

Labels

os:aix os:freebsd os:linux os:openbsd package:cpu package:disk package:docker package:load package:mem package:net package:process

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@shirou