github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-28 16:27:50 +00:00
Code Issues Projects Releases Wiki Activity

bugfix: fix potential panic

Browse Source 
* Fix potential panic by nil pointer.
* Address comments.

Signed-off-by: Wei Zhang <zhangwei555@huawei.com>
This commit is contained in:
Wei Zhang 2019-04-19 15:28:27 +08:00
parent 9bd4e5008c
commit 3262da0207
4 changed files with 30 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
virtcontainers/device/drivers/block.go
View File

@ -153,16 +153,18 @@ func (device *BlockDevice) Dump() persistapi.DeviceState {
ds.Type = string(device.DeviceType())
drive := device.BlockDrive
ds.BlockDrive = &persistapi.BlockDrive{
File: drive.File,
Format: drive.Format,
ID: drive.ID,
Index: drive.Index,
MmioAddr: drive.MmioAddr,
PCIAddr: drive.PCIAddr,
SCSIAddr: drive.SCSIAddr,
NvdimmID: drive.NvdimmID,
VirtPath: drive.VirtPath,
if drive != nil {
ds.BlockDrive = &persistapi.BlockDrive{
File: drive.File,
Format: drive.Format,
ID: drive.ID,
Index: drive.Index,
MmioAddr: drive.MmioAddr,
PCIAddr: drive.PCIAddr,
SCSIAddr: drive.SCSIAddr,
NvdimmID: drive.NvdimmID,
VirtPath: drive.VirtPath,
}
}
return ds
}

17
virtcontainers/device/drivers/generic.go
View File

@ -119,16 +119,19 @@ func (device *GenericDevice) bumpAttachCount(attach bool) (skip bool, err error)
// Dump convert and return data in persist format
func (device *GenericDevice) Dump() persistapi.DeviceState {
info := device.DeviceInfo
return persistapi.DeviceState{
dss := persistapi.DeviceState{
ID: device.ID,
Type: string(device.DeviceType()),
RefCount: device.RefCount,
AttachCount: device.AttachCount,
DevType: info.DevType,
Major: info.Major,
Minor: info.Minor,
DriverOptions: info.DriverOptions,
}
info := device.DeviceInfo
if info != nil {
dss.DevType = info.DevType
dss.Major = info.Major
dss.Minor = info.Minor
dss.DriverOptions = info.DriverOptions
}
return dss
}

14
virtcontainers/device/drivers/vfio.go
View File

@ -147,12 +147,14 @@ func (device *VFIODevice) Dump() persistapi.DeviceState {
devs := device.VfioDevs
for _, dev := range devs {
ds.VFIODevs = append(ds.VFIODevs, &persistapi.VFIODev{
ID: dev.ID,
Type: string(dev.Type),
BDF: dev.BDF,
SysfsDev: dev.SysfsDev,
})
if dev != nil {
ds.VFIODevs = append(ds.VFIODevs, &persistapi.VFIODev{
ID: dev.ID,
Type: string(dev.Type),
BDF: dev.BDF,
SysfsDev: dev.SysfsDev,
})
}
}
return ds
}

3
virtcontainers/persist/fs/fs.go
View File

@ -98,9 +98,6 @@ func (fs *FS) ToDisk() (retErr error) {
}
if err := fs.lock(); err != nil {
if err1 := fs.Destroy(); err1 != nil {
fs.Logger().WithError(err1).Errorf("failed to destroy dirs")
}
return err
}
defer fs.unlock()