Merge release-20210712.0-59-g3d0a93000 (automated)

1 files changed, 5 insertions, 5 deletions

diff --git a/pkg/sentry/kernel/semaphore/semaphore.go b/pkg/sentry/kernel/semaphore/semaphore.go
index b7879d284..8610d3fc1 100644
--- a/pkg/sentry/kernel/semaphore/semaphore.go
+++ b/pkg/sentry/kernel/semaphore/semaphore.go
@@ -214,15 +214,14 @@ func (r *Registry) Remove(id ipc.ID, creds *auth.Credentials) error {
 	r.mu.Lock()
 	defer r.mu.Unlock()
 
-	r.reg.Remove(id, creds)
-
 	index, found := r.findIndexByID(id)
 	if !found {
-		// Inconsistent state.
-		panic(fmt.Sprintf("unable to find an index for ID: %d", id))
+		return linuxerr.EINVAL
 	}
 	delete(r.indexes, index)
 
+	r.reg.Remove(id, creds)
+
 	return nil
 }
 
@@ -245,7 +244,8 @@ func (r *Registry) newSetLocked(ctx context.Context, key ipc.Key, creator fs.Fil
 
 	index, found := r.findFirstAvailableIndex()
 	if !found {
-		panic("unable to find an available index")
+		// See linux, ipc/sem.c:newary().
+		return nil, linuxerr.ENOSPC
 	}
 	r.indexes[index] = set.obj.ID