Browse Source

Fix race accessing plugin storage map

`plugins.GetAll()` was not locking the plugin map when checking if a
plugin exists, this can cause a race and potentially a panic if another
goroutine is trying to load a plugin into the map at the same time.

Also fixes a race during activation where a plugin inserts itself into
the plugin map but does not check if something else is already there.
This is already checked before trying to activate the plugin, however
the map lock is not held for this entire period, so other plugins may be
loaded during this time.
To fix, before inserting the plugin into the map, check if one with the
same name already exists and use that instead.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 21fcbb39b73310e69d6403a1cfa8b26799cc1355)
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Brian Goff 8 năm trước cách đây
mục cha
commit
3b2982a2bb
1 tập tin đã thay đổi với 8 bổ sung1 xóa
  1. 8 1
      pkg/plugins/plugins.go

+ 8 - 1
pkg/plugins/plugins.go

@@ -221,6 +221,10 @@ func loadWithRetry(name string, retry bool) (*Plugin, error) {
 		}
 		}
 
 
 		storage.Lock()
 		storage.Lock()
+		if pl, exists := storage.plugins[name]; exists {
+			storage.Unlock()
+			return pl, pl.activate()
+		}
 		storage.plugins[name] = pl
 		storage.plugins[name] = pl
 		storage.Unlock()
 		storage.Unlock()
 
 
@@ -298,7 +302,10 @@ func GetAll(imp string) ([]*Plugin, error) {
 	chPl := make(chan *plLoad, len(pluginNames))
 	chPl := make(chan *plLoad, len(pluginNames))
 	var wg sync.WaitGroup
 	var wg sync.WaitGroup
 	for _, name := range pluginNames {
 	for _, name := range pluginNames {
-		if pl, ok := storage.plugins[name]; ok {
+		storage.Lock()
+		pl, ok := storage.plugins[name]
+		storage.Unlock()
+		if ok {
 			chPl <- &plLoad{pl, nil}
 			chPl <- &plLoad{pl, nil}
 			continue
 			continue
 		}
 		}