fix locks

containerd · Nov 26, 2024 · 5e08bf0 · 5e08bf0
1 parent d96cc3b
commit 5e08bf0
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/cni.go b/cni.go
@@ -166,6 +166,8 @@ func (c *libcni) Setup(ctx context.Context, id string, path string, opts ...Name
 	if err := c.ready(); err != nil {
 		return nil, err
 	}
+	c.RLock()
+	defer c.RUnlock()
 	ns, err := newNamespace(id, path, opts...)
 	if err != nil {
 		return nil, err
@@ -182,6 +184,8 @@ func (c *libcni) SetupSerially(ctx context.Context, id string, path string, opts
 	if err := c.ready(); err != nil {
 		return nil, err
 	}
+	c.RLock()
+	defer c.RUnlock()
 	ns, err := newNamespace(id, path, opts...)
 	if err != nil {
 		return nil, err
@@ -245,6 +249,8 @@ func (c *libcni) Remove(ctx context.Context, id string, path string, opts ...Nam
 	if err := c.ready(); err != nil {
 		return err
 	}
+	c.RLock()
+	defer c.RUnlock()
 	ns, err := newNamespace(id, path, opts...)
 	if err != nil {
 		return err
@@ -273,6 +279,8 @@ func (c *libcni) Check(ctx context.Context, id string, path string, opts ...Name
 	if err := c.ready(); err != nil {
 		return err
 	}
+	c.RLock()
+	defer c.RUnlock()
 	ns, err := newNamespace(id, path, opts...)
 	if err != nil {
 		return err
@@ -322,8 +330,6 @@ func (c *libcni) reset() {
 }
 
 func (c *libcni) ready() error {
-	c.RLock()
-	defer c.RUnlock()
 	if len(c.networks) < c.networkCount {
 		return ErrCNINotInitialized
 	}