Skip to content

fix: guard GFD PCI vendor capability parsing against bad lengths #1928

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
amarkdotdev wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: guard GFD PCI vendor capability parsing against bad lengths #1928

Show file tree
Hide file tree
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
11 changes: 10 additions & 1 deletion internal/vgpu/pciutil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,11 @@ func (d *PCIDevice) GetVendorSpecificCapability() ([]byte, error) {
var visited [256]byte
pos := GetByte(d.Config, PciCapabilityList)
for pos != 0 {
capHeaderEnd := int(pos) + int(PciCapabilityLength) + 1
if capHeaderEnd > len(d.Config) {
break
}

id := GetByte(d.Config, pos+PciCapabilityListID)
next := GetByte(d.Config, pos+PciCapabilityListNext)
length := GetByte(d.Config, pos+PciCapabilityLength)
Expand All @@ -137,7 +142,11 @@ func (d *PCIDevice) GetVendorSpecificCapability() ([]byte, error) {
break
}
if id == PciCapabilityVendorSpecificID {
capability := d.Config[pos+PciCapabilityListID : pos+PciCapabilityListID+length]
capEnd := int(pos) + int(PciCapabilityListID) + int(length)
if capEnd > len(d.Config) {
break
}
capability := d.Config[pos+PciCapabilityListID : capEnd]
return capability, nil
}

Expand Down
18 changes: 18 additions & 0 deletions internal/vgpu/pciutil_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,24 @@ import (
"github.com/stretchr/testify/require"
)

func TestGetVendorSpecificCapabilityMalformedLength(t *testing.T) {
config := make([]byte, 256)
config[PciStatusByte] = PciStatusCapabilityList
config[PciCapabilityList] = 224

config[224+PciCapabilityListID] = PciCapabilityVendorSpecificID
config[224+PciCapabilityLength] = 100

device := &PCIDevice{
Address: "malformed",
Config: config,
}

capability, err := device.GetVendorSpecificCapability()
require.NoError(t, err)
require.Nil(t, capability)
}

func TestGetVendorSpecificCapability(t *testing.T) {
devices, _ := NewMockNvidiaPCI().Devices()
for _, device := range devices {
Expand Down