Skip to content

fix(event): Dangling registry value data buffer #542

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
rabbitstack merged 2 commits into from
Dec 29, 2025
Merged

fix(event): Dangling registry value data buffer #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6bb8d04
fix(event): Copy registry data buffer
rabbitstack Dec 21, 2025
c0e1370
fix(event): Correct registry string value parsing
rabbitstack Dec 21, 2025
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
32 changes: 20 additions & 12 deletions pkg/event/param_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,15 @@ import (
"encoding/binary"
"expvar"
"fmt"
"net"
"path/filepath"
"strconv"
"strings"
"time"
"unsafe"

"github.com/rabbitstack/fibratus/pkg/util/utf16"

"github.com/rabbitstack/fibratus/pkg/event/params"
"github.com/rabbitstack/fibratus/pkg/fs"
htypes "github.com/rabbitstack/fibratus/pkg/handle/types"
Expand All @@ -35,12 +44,6 @@ import (
"github.com/rabbitstack/fibratus/pkg/util/va"
"golang.org/x/sys/windows"
"golang.org/x/sys/windows/registry"
"net"
"path/filepath"
"strconv"
"strings"
"time"
"unsafe"
)

// unknownKeysCount counts the number of times the registry key failed to convert from native format
Expand Down Expand Up @@ -520,23 +523,28 @@ func (e *Event) produceParams(evt *etw.EventRecord) {
capturedSize := evt.ReadUint16(voffset)
capturedData := evt.ReadBytes(2+voffset, capturedSize)

// copy the buffer as it points to invalid
// memory when the callback function returns
b := make([]byte, capturedSize)
copy(b, capturedData)

e.AppendParam(params.RegKeyHandle, params.Address, keyObject)
e.AppendParam(params.NTStatus, params.Status, status)
e.AppendParam(params.RegPath, params.Key, filepath.Join(keyName, valueName))
e.AppendEnum(params.RegValueType, valueType, key.RegistryValueTypes)

if len(capturedData) > 0 {
if len(b) > 0 {
switch valueType {
case registry.SZ, registry.MULTI_SZ, registry.EXPAND_SZ:
e.AppendParam(params.RegData, params.UnicodeString, string(capturedData))
e.AppendParam(params.RegData, params.UnicodeString, utf16.BytesToString(b, binary.LittleEndian))
case registry.BINARY:
e.AppendParam(params.RegData, params.Binary, capturedData)
e.AppendParam(params.RegData, params.Binary, b)
case registry.DWORD:
e.AppendParam(params.RegData, params.Uint32, binary.LittleEndian.Uint32(capturedData))
e.AppendParam(params.RegData, params.Uint32, binary.LittleEndian.Uint32(b))
case registry.DWORD_BIG_ENDIAN:
e.AppendParam(params.RegData, params.Uint32, binary.BigEndian.Uint32(capturedData))
e.AppendParam(params.RegData, params.Uint32, binary.BigEndian.Uint32(b))
case registry.QWORD:
e.AppendParam(params.RegData, params.Uint64, binary.LittleEndian.Uint64(capturedData))
e.AppendParam(params.RegData, params.Uint64, binary.LittleEndian.Uint64(b))
}
}
case CreateFile:
Expand Down
14 changes: 14 additions & 0 deletions pkg/util/utf16/utf16.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
package utf16

import (
"encoding/binary"
"unicode/utf8"
)

Expand Down Expand Up @@ -58,3 +59,16 @@ func Decode(p []uint16) string {
}
return string(s)
}

// BytesToString converts the UTF16-encoded byte buffer to string.
func BytesToString(b []byte, o binary.ByteOrder) string {
utf := make([]uint16, 0, len(b)/2)
for i := 0; i+1 < len(b); i += 2 {
u := o.Uint16(b[i:])
if u == 0 {
break // stop at null terminator
}
utf = append(utf, u)
}
return Decode(utf)
}
Loading