proxy: destroy used buffer on exit (#3888)

Signed-off-by: Takahiro Yamashita <[email protected]>
fluent · Dec 12, 2021 · 83686a5 · 83686a5
1 parent dcb7fda
commit 83686a5
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 32 deletions.
diff --git a/include/fluent-bit/flb_plugin_proxy.h b/include/fluent-bit/flb_plugin_proxy.h
@@ -44,10 +44,7 @@ struct flb_plugin_proxy_def {
 /* Proxy context */
 struct flb_plugin_proxy {
     /* Fields populated once remote flb_cb_register() is called */
-    int type;                 /* defined by FLB_PROXY_[INPUT|OUTPUT]_PLUGIN  */
-    int proxy;                /* proxy type                                  */
-    char *name;               /* plugin short name                           */
-    char *description;        /* plugin description                          */
+    struct flb_plugin_proxy_def *def;
 
     /* Internal */
     struct flb_api *api;      /* API context to export functions             */

diff --git a/src/flb_plugin_proxy.c b/src/flb_plugin_proxy.c
@@ -50,7 +50,7 @@ static void proxy_cb_flush(struct flb_event_chunk *event_chunk,
 
 
 #ifdef FLB_HAVE_PROXY_GO
-    if (ctx->proxy->proxy == FLB_PROXY_GOLANG) {
+    if (ctx->proxy->def->proxy == FLB_PROXY_GOLANG) {
         flb_trace("[GO] entering go_flush()");
         ret = proxy_go_flush(ctx,
                              event_chunk->data,
@@ -69,26 +69,16 @@ static void proxy_cb_flush(struct flb_event_chunk *event_chunk,
     FLB_OUTPUT_RETURN(ret);
 }
 
-
+static void flb_plugin_proxy_destroy(struct flb_plugin_proxy *proxy);
 static int flb_proxy_cb_exit(void *data, struct flb_config *config)
 {
     struct flb_output_plugin *instance = data;
     struct flb_plugin_proxy *proxy = (instance->proxy);
-    struct flbgo_output_plugin *plugin;
-    void *inst;
-
-    inst = proxy->data;
 
-    plugin = (struct flbgo_output_plugin *) inst;
-    flb_debug("[GO] running exit callback");
-
-    if (plugin->cb_exit_ctx) {
-        return plugin->cb_exit_ctx(plugin->context->remote_context);
-    }
-    else if (plugin->cb_exit) {
-        return plugin->cb_exit();
+    if (proxy->def->proxy == FLB_PROXY_GOLANG) {
+        proxy_go_destroy(proxy->data);
     }
-
+    flb_plugin_proxy_destroy(proxy);
     return 0;
 }
 
@@ -108,8 +98,8 @@ static int flb_proxy_register_output(struct flb_plugin_proxy *proxy,
     out->type  = FLB_OUTPUT_PLUGIN_PROXY;
     out->proxy = proxy;
     out->flags = def->flags;
-    out->name  = flb_strdup(def->name);
-    out->description = flb_strdup(def->description);
+    out->name  = def->name;
+    out->description = def->description;
     mk_list_add(&out->_head, &config->out_plugins);
 
     /*
@@ -140,7 +130,7 @@ int flb_plugin_proxy_register(struct flb_plugin_proxy *proxy,
 {
     int ret;
     int (*cb_register)(struct flb_plugin_proxy_def *);
-    struct flb_plugin_proxy_def *def;
+    struct flb_plugin_proxy_def *def = proxy->def;
 
     /* Lookup the registration callback */
     cb_register = flb_plugin_proxy_symbol(proxy, "FLBPluginRegister");
@@ -156,10 +146,6 @@ int flb_plugin_proxy_register(struct flb_plugin_proxy *proxy,
      * - plugin name
      * - plugin description
      */
-    def = flb_malloc(sizeof(struct flb_plugin_proxy_def));
-    if (!def) {
-        return -1;
-    }
 
     /* Do the registration */
     ret = cb_register(def);
@@ -184,7 +170,6 @@ int flb_plugin_proxy_register(struct flb_plugin_proxy *proxy,
          * real link to the 'output' interface
          */
         if (def->type == FLB_PROXY_OUTPUT_PLUGIN) {
-            proxy->proxy = def->proxy;
             flb_proxy_register_output(proxy, def, config);
         }
     }
@@ -202,14 +187,14 @@ int flb_plugin_proxy_init(struct flb_plugin_proxy *proxy,
     proxy->instance = o_ins;
 
     /* Based on 'proxy', use the proper handler */
-    if (proxy->proxy == FLB_PROXY_GOLANG) {
+    if (proxy->def->proxy == FLB_PROXY_GOLANG) {
 #ifdef FLB_HAVE_PROXY_GO
         ret = proxy_go_init(proxy);
 #endif
     }
     else {
         fprintf(stderr, "[proxy] unrecognized proxy handler %i\n",
-                proxy->proxy);
+                proxy->def->proxy);
     }
 
     return ret;
@@ -245,8 +230,17 @@ struct flb_plugin_proxy *flb_plugin_proxy_create(const char *dso_path, int type,
         return NULL;
     }
 
+    proxy->def = flb_malloc(sizeof(struct flb_plugin_proxy_def));
+    if (!proxy->def) {
+        flb_errno();
+        dlclose(handle);
+        flb_api_destroy(proxy->api);
+        flb_free(proxy);
+        return NULL;
+    }
+
     /* Set fields and add it to the list */
-    proxy->type        = type;
+    proxy->def->type        = type;
     proxy->dso_handler = handle;
     proxy->data        = NULL;
     mk_list_add(&proxy->_head, &config->proxies);
@@ -257,9 +251,17 @@ struct flb_plugin_proxy *flb_plugin_proxy_create(const char *dso_path, int type,
     return proxy;
 }
 
-void flb_plugin_proxy_destroy(struct flb_plugin_proxy *proxy)
+static void flb_plugin_proxy_destroy(struct flb_plugin_proxy *proxy)
 {
     /* cleanup */
+    void (*cb_unregister)(struct flb_plugin_proxy_def *def);
+
+    cb_unregister = flb_plugin_proxy_symbol(proxy, "FLBPluginUnregister");
+    if (cb_unregister != NULL) {
+        cb_unregister(proxy->def);
+    }
+    flb_free(proxy->def);
+    flb_api_destroy(proxy->api);
     dlclose(proxy->dso_handler);
     mk_list_del(&proxy->_head);
     flb_free(proxy);

diff --git a/src/proxy/go/go.c b/src/proxy/go/go.c
@@ -145,3 +145,22 @@ int proxy_go_flush(struct flb_plugin_proxy_context *ctx,
     flb_free(buf);
     return ret;
 }
+
+int proxy_go_destroy(void *data)
+{
+    int ret = 0;
+    struct flbgo_output_plugin *plugin;
+
+    plugin = (struct flbgo_output_plugin *) data;
+    flb_debug("[GO] running exit callback");
+
+    if (plugin->cb_exit_ctx) {
+        ret = plugin->cb_exit_ctx(plugin->context->remote_context);
+    }
+    else if (plugin->cb_exit) {
+        ret = plugin->cb_exit();
+    }
+    flb_free(plugin->name);
+    flb_free(plugin);
+    return ret;
+}
diff --git a/src/proxy/go/go.h b/src/proxy/go/go.h
@@ -45,5 +45,5 @@ int proxy_go_init(struct flb_plugin_proxy *proxy);
 int proxy_go_flush(struct flb_plugin_proxy_context *ctx,
                    const void *data, size_t size,
                    const char *tag, int tag_len);
-
+int proxy_go_destroy(void *data);
 #endif