From 977269202e18f942610819ea6bea486b137d0aae Mon Sep 17 00:00:00 2001 From: Slawek Figiel <4471997+fivitti@users.noreply.github.com> Date: Tue, 20 Aug 2024 12:40:07 +0200 Subject: [PATCH 1/3] fix: handle invalid KinfoProc size on BSD systems --- process/process_freebsd.go | 3 ++- process/process_openbsd.go | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/process/process_freebsd.go b/process/process_freebsd.go index d87c43e..436dcf0 100644 --- a/process/process_freebsd.go +++ b/process/process_freebsd.go @@ -6,6 +6,7 @@ package process import ( "bytes" "context" + "errors" "path/filepath" "strconv" "strings" @@ -329,7 +330,7 @@ func (p *Process) getKProc() (*KinfoProc, error) { return nil, err } if length != sizeOfKinfoProc { - return nil, err + return nil, errors.New("unexpected size of KinfoProc") } k, err := parseKinfoProc(buf) diff --git a/process/process_openbsd.go b/process/process_openbsd.go index 76ae3e3..e2d0ab4 100644 --- a/process/process_openbsd.go +++ b/process/process_openbsd.go @@ -7,6 +7,7 @@ import ( "bytes" "context" "encoding/binary" + "errors" "fmt" "io" "path/filepath" @@ -343,7 +344,7 @@ func (p *Process) getKProc() (*KinfoProc, error) { return nil, err } if length != sizeOfKinfoProc { - return nil, err + return nil, errors.New("unexpected size of KinfoProc") } k, err := parseKinfoProc(buf) From 72d3ba4191f2af0669ee5f3faa0f9c5e27e9c52f Mon Sep 17 00:00:00 2001 From: shirou Date: Sun, 25 Aug 2024 22:49:43 +0900 Subject: [PATCH 2/3] [disk][windows]: ignore network drive when not ready --- disk/disk_windows.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/disk/disk_windows.go b/disk/disk_windows.go index 9fefb14..4f371a3 100644 --- a/disk/disk_windows.go +++ b/disk/disk_windows.go @@ -133,7 +133,7 @@ func PartitionsWithContext(ctx context.Context, all bool) ([]PartitionStat, erro uintptr(unsafe.Pointer(&lpFileSystemNameBuffer[0])), uintptr(len(lpFileSystemNameBuffer))) if driveret == 0 { - if typeret == 5 || typeret == 2 { + if typeret == 2 || typeret == 4 || typeret == 5 { continue // device is not ready will happen if there is no disk in the drive } warnings.Add(err) From 050902aeaab429aa8217625c6c614bd57bacb1cf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 2 Sep 2024 01:12:28 +0000 Subject: [PATCH 3/3] chore(deps): bump actions/upload-artifact from 4.3.6 to 4.4.0 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.3.6 to 4.4.0. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/834a144ee995460fba8ed112a2fc961b36a5ec5a...50769540e7f4bd5e21e526ee35c689e35e0d6874) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/sbom_generator.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/sbom_generator.yml b/.github/workflows/sbom_generator.yml index c9a08a6..f6af6c4 100644 --- a/.github/workflows/sbom_generator.yml +++ b/.github/workflows/sbom_generator.yml @@ -19,7 +19,7 @@ jobs: id: sbom env: GITHUB_TOKEN: ${{ github.token }} - - uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6 + - uses: actions/upload-artifact@50769540e7f4bd5e21e526ee35c689e35e0d6874 # v4.4.0 with: path: ${{steps.sbom.outputs.fileName }} name: "SBOM"