github/portmaster
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(control): ensure wall-clock comparison for resume worker deadline

Browse Source
This commit is contained in:
Alexandr Stelnykovych
2025-12-01 13:32:46 +02:00
parent 1a47196d84
commit 9af071ef17
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
service/control/pause.go
View File

@@ -143,7 +143,9 @@ func (c *Control) stopResumeWorker() {
// startResumeWorker starts a worker that will resume normal operation after the specified duration. // startResumeWorker starts a worker that will resume normal operation after the specified duration.
// No thread safety, caller must hold c.locker. // No thread safety, caller must hold c.locker.
func (c *Control) startResumeWorker(duration time.Duration) { func (c *Control) startResumeWorker(duration time.Duration) {
deadline := time.Now().Add(duration) // Strip monotonic clock from deadline to force wall-clock comparison.
// This is critical for VM suspend/resume and system sleep scenarios.
deadline := time.Now().Round(0).Add(duration)
c.pauseInfo.TillTime = deadline c.pauseInfo.TillTime = deadline
resumerWorkerFunc := func(wc *mgr.WorkerCtx) error { resumerWorkerFunc := func(wc *mgr.WorkerCtx) error {
@@ -173,7 +175,8 @@ func (c *Control) startResumeWorker(duration time.Duration) {
needToAutoResume = true needToAutoResume = true
} }
case <-ticker.C: case <-ticker.C:
if time.Now().After(deadline) { // Check wall-clock time.
if time.Now().Round(0).After(deadline) {
needToAutoResume = true needToAutoResume = true
} }
case <-timer.C: case <-timer.C: