Skip to content

[scanner] fix: safe uintptr-to-int conversion in flock_unix.go #19787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
clubanderson merged 7 commits into from
Jun 27, 2026
+8 −2
Merged

[scanner] fix: safe uintptr-to-int conversion in flock_unix.go #19787

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
534b7fb
[scanner] fix: safe uintptr-to-int conversion in flock_unix.go
clubanderson Jun 27, 2026
b8b20fb
fix: add DCO sign-off
clubanderson Jun 27, 2026
825912e
Merge branch 'main' into scanner/fix-19782
clubanderson Jun 27, 2026
4f4dcdf
fix: update nilaway-baseline.json with shifted line numbers
clubanderson Jun 27, 2026
7a0ab18
fix: revert nilaway baseline to match main
clubanderson Jun 27, 2026
3095be3
Merge branch 'main' into scanner/fix-19782
clubanderson Jun 27, 2026
13c8c78
fix: DCO sign-off
clubanderson Jun 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions pkg/agent/tokentracker/flock_unix.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package tokentracker

import (
"fmt"
"math"
"os"
"syscall"
)
Expand All @@ -24,8 +25,13 @@ func acquireFileLock(path string) (release func(), err error) {
return nil, fmt.Errorf("open lock file: %w", err)
}

// Store fd as int to avoid unsafe uintptr -> int conversion (gosec G115)
fd := int(f.Fd())
// Safe conversion: validate uintptr fits in int (gosec G115)
uintptrVal := f.Fd()
if uintptrVal > uintptr(math.MaxInt) {
f.Close()
return nil, fmt.Errorf("file descriptor out of range: %v", uintptrVal)
}
Comment on lines +30 to +33
fd := int(uintptrVal)

if err := syscall.Flock(fd, syscall.LOCK_EX); err != nil {
f.Close()
Expand Down
Loading