Skip to content

fix(ps): Avoid returning module temporary copy on stack under released lock #669

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

Open
rabbitstack wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(ps): Avoid returning module temporary copy on stack under released lock #669

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 18 additions & 18 deletions pkg/ps/types/types_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,9 @@ func (ps *PS) RemoveHandle(handle windows.Handle) {

// AddModule adds a new module to this process state.
func (ps *PS) AddModule(mod Module) {
ps.RLock()
m := ps.FindModuleByAddr(mod.BaseAddress)
ps.RUnlock()
if m != nil {
return
}
Expand All @@ -522,21 +524,19 @@ func (ps *PS) RemoveModule(addr va.Address) {
func (ps *PS) FindModule(path string) *Module {
ps.RLock()
defer ps.RUnlock()
for _, mod := range ps.Modules {
if filepath.Base(mod.Name) == filepath.Base(path) {
return &mod
for i := range ps.Modules {
if filepath.Base(ps.Modules[i].Name) == filepath.Base(path) {
return &ps.Modules[i]
}
}
return nil
}

// FindModuleByAddr finds the module by its base address.
func (ps *PS) FindModuleByAddr(addr va.Address) *Module {
ps.RLock()
defer ps.RUnlock()
for _, mod := range ps.Modules {
if mod.BaseAddress == addr {
return &mod
for i := range ps.Modules {
if ps.Modules[i].BaseAddress == addr {
return &ps.Modules[i]
}
}
return nil
Expand All @@ -549,7 +549,9 @@ var queryLiveModules = func(pid uint32) []sys.ProcessModule {
// FindModuleByVa finds the module name by
// probing the range of the given virtual address.
func (ps *PS) FindModuleByVa(addr va.Address) *Module {
ps.RLock()
mod := ps.findModuleByVa(addr)
ps.RUnlock()
if mod != nil {
return mod
}
Expand All @@ -569,31 +571,29 @@ func (ps *PS) FindModuleByVa(addr va.Address) *Module {
if addr < b || addr >= b.Inc(size) {
continue
}

mod := Module{
mod := &Module{
Name: m.Name,
BaseAddress: b,
Size: size,
DefaultBaseAddress: b,
}

ps.Lock()
ps.Modules = append(ps.Modules, mod)
ps.Modules = append(ps.Modules, *mod)
ps.Unlock()

return &mod
return mod
}

return nil
}

func (ps *PS) findModuleByVa(addr va.Address) *Module {
ps.RLock()
defer ps.RUnlock()
for _, mod := range ps.Modules {
end := mod.BaseAddress.Inc(mod.Size)
if addr >= mod.BaseAddress && addr < end {
return &mod
for i := range ps.Modules {
end := ps.Modules[i].BaseAddress.Inc(ps.Modules[i].Size)
if addr >= ps.Modules[i].BaseAddress && addr < end {
mod := &ps.Modules[i]
return mod
}
}
return nil
Expand Down
Loading