Merge pull request #1694 from fivitti/master

Fix panic on OpenBSD and FreeBSD systems if KinfoProc size has an unexpected size
shirou · Aug 26, 2024 · 74cb403 · 74cb403
2 parents 7404c1f + 9772692
commit 74cb403
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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)