Buriburizaemon/nezha_domains
1
0
Fork 0
mirror of https://github.com/Buriburizaem0n/nezha_domains.git synced 2026-09-19 17:50:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(agentcompat): decode inotify events safely

Browse Source 
Co-authored-by: naiba/CloudCode <hi+cloudcode@nai.ba>
This commit is contained in:
naiba
2026-07-20 17:03:20 +00:00
co-authored by naiba/CloudCode
parent b92ab9a60f
commit 57f9564ce1
2 changed files with 88 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
integration/agentcompat/internal/process/sqlite_journal_watch.go
+28 -9
View File
@@ -5,11 +5,11 @@ package process
import (
"bytes"
"context"
"encoding/binary"
"errors"
"fmt"
"path/filepath"
"sync"
"unsafe"
"golang.org/x/sys/unix"
)
@@ -35,6 +35,12 @@ type SQLiteJournalWatch struct {
deleted bool
}
type inotifyEvent struct {
watchDescriptor int32
mask uint32
name []byte
}
func OpenSQLiteJournalWatch(path string) (*SQLiteJournalWatch, error) {
journalFD, err := unix.Open(path, unix.O_PATH|unix.O_NOFOLLOW|unix.O_CLOEXEC, 0)
if err != nil {
@@ -140,22 +146,35 @@ func (watch *SQLiteJournalWatch) readEvents() error {
if err != nil {
return err
}
for offset := 0; offset+unix.SizeofInotifyEvent <= count; {
event := (*unix.InotifyEvent)(unsafe.Pointer(&buffer[offset]))
next := offset + unix.SizeofInotifyEvent + int(event.Len)
if next > count {
for offset := 0; offset < count; {
event, consumed, err := decodeInotifyEvent(buffer[offset:count])
if err != nil {
return &SQLiteJournalLifecycleError{}
}
nameStart := offset + unix.SizeofInotifyEvent
name := bytes.TrimRight(buffer[nameStart:next], "\x00")
if err := watch.observeEvent(event.Wd, event.Mask, name); err != nil {
if err := watch.observeEvent(event.watchDescriptor, event.mask, event.name); err != nil {
return err
}
offset = next
offset += consumed
}
return nil
}
func decodeInotifyEvent(buffer []byte) (inotifyEvent, int, error) {
if len(buffer) < unix.SizeofInotifyEvent {
return inotifyEvent{}, 0, errors.New("truncated inotify header")
}
nameLength := binary.NativeEndian.Uint32(buffer[12:])
if uint64(nameLength) > uint64(len(buffer)-unix.SizeofInotifyEvent) {
return inotifyEvent{}, 0, errors.New("truncated inotify name")
}
consumed64 := uint64(unix.SizeofInotifyEvent) + uint64(nameLength)
if consumed64 > uint64(^uint(0)>>1) {
return inotifyEvent{}, 0, errors.New("inotify event exceeds int range")
}
consumed := int(consumed64)
return inotifyEvent{watchDescriptor: int32(binary.NativeEndian.Uint32(buffer)), mask: binary.NativeEndian.Uint32(buffer[4:]), name: bytes.TrimRight(buffer[unix.SizeofInotifyEvent:consumed], "\x00")}, consumed, nil
}
func (watch *SQLiteJournalWatch) observeEvent(watchDescriptor int32, mask uint32, name []byte) error {
if int(watchDescriptor) == watch.directoryWD && mask&unix.IN_DELETE != 0 && bytes.Equal(name, watch.journalName) {
return watch.observe(unix.IN_DELETE_SELF)