Skip to content

Commit 73f5659

Browse files
authored
fix(usbgadget): add lock for logWithSupression (jetkvm#653)
1 parent 960f555 commit 73f5659

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

internal/usbgadget/usbgadget.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ type UsbGadget struct {
8181
log *zerolog.Logger
8282

8383
logSuppressionCounter map[string]int
84+
logSuppressionLock sync.Mutex
8485
}
8586

8687
const configFSPath = "/sys/kernel/config"

internal/usbgadget/utils.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,9 @@ func compareFileContent(oldContent []byte, newContent []byte, looserMatch bool)
8282
}
8383

8484
func (u *UsbGadget) logWithSupression(counterName string, every int, logger *zerolog.Logger, err error, msg string, args ...interface{}) {
85+
u.logSuppressionLock.Lock()
86+
defer u.logSuppressionLock.Unlock()
87+
8588
if _, ok := u.logSuppressionCounter[counterName]; !ok {
8689
u.logSuppressionCounter[counterName] = 0
8790
} else {
@@ -100,6 +103,9 @@ func (u *UsbGadget) logWithSupression(counterName string, every int, logger *zer
100103
}
101104

102105
func (u *UsbGadget) resetLogSuppressionCounter(counterName string) {
106+
u.logSuppressionLock.Lock()
107+
defer u.logSuppressionLock.Unlock()
108+
103109
if _, ok := u.logSuppressionCounter[counterName]; !ok {
104110
u.logSuppressionCounter[counterName] = 0
105111
}

0 commit comments

Comments
 (0)