github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-12 22:58:58 +00:00
Code Issues Projects Releases Wiki Activity

vc: BlockIndex should not be altered in case of error

Browse Source 
BlockIndex should not increment in case of error.

Similar issue applies to decrementSandboxBlockIndex where the symptom may be more severe - in worst case, the block index may become negative.

Fixes #2244

Signed-off-by: Ted Yu <yuzhihong@gmail.com>
This commit is contained in:
Ted Yu 2019-11-21 15:34:33 -08:00
parent a17ca14c7a
commit c833ac2c53
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
virtcontainers/sandbox.go
View File

@ -1686,6 +1686,12 @@ func (s *Sandbox) resumeSetStates() error {
// block device is assigned to a container in the sandbox. // block device is assigned to a container in the sandbox.
func (s *Sandbox) getAndSetSandboxBlockIndex() (int, error) { func (s *Sandbox) getAndSetSandboxBlockIndex() (int, error) {
currentIndex := s.state.BlockIndex currentIndex := s.state.BlockIndex
var err error
defer func() {
if err != nil {
s.state.BlockIndex = currentIndex
}
}()
// Increment so that container gets incremented block index // Increment so that container gets incremented block index
s.state.BlockIndex++ s.state.BlockIndex++
@ -1704,12 +1710,19 @@ func (s *Sandbox) getAndSetSandboxBlockIndex() (int, error) {
// decrementSandboxBlockIndex decrements the current sandbox block index. // decrementSandboxBlockIndex decrements the current sandbox block index.
// This is used to recover from failure while adding a block device. // This is used to recover from failure while adding a block device.
func (s *Sandbox) decrementSandboxBlockIndex() error { func (s *Sandbox) decrementSandboxBlockIndex() error {
var err error
original := s.state.BlockIndex
s.state.BlockIndex-- s.state.BlockIndex--
defer func() {
if err != nil {
s.state.BlockIndex = original
}
}()
if !s.supportNewStore() { if !s.supportNewStore() {
// experimental runtime use "persist.json" which doesn't need "state.json" anymore // experimental runtime use "persist.json" which doesn't need "state.json" anymore
// update on-disk state // update on-disk state
if err := s.store.Store(store.State, s.state); err != nil { if err = s.store.Store(store.State, s.state); err != nil {
return err return err
} }
} }