Signed-off-by: Ramon Fried <[email protected]> --- v2: No changes ...caused-by-using-flb_free-instead-of-.patch | 43 ++++++++++ ...GV-caused-by-using-flb_free-instead-.patch | 82 +++++++++++++++++++ .../fluentbit/fluentbit_1.3.5.bb | 4 +- 3 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch create mode 100644 meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch
diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch new file mode 100644 index 000000000..a6ff5991c --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch @@ -0,0 +1,43 @@ +From 3d7390c89c2205d1eed0384be0bb65adb675e60d Mon Sep 17 00:00:00 2001 +From: Ramon Fried <[email protected]> +Date: Tue, 9 Feb 2021 18:59:59 +0200 +Subject: [PATCH] bin: fix SIGSEGV caused by using flb_free instead of + mk_mem_free + +Upstream-Status: Accepted +Signed-off-by: Ramon Fried <[email protected]> +--- + src/fluent-bit.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/fluent-bit.c b/src/fluent-bit.c +index c0c73b4..989cfde 100644 +--- a/src/fluent-bit.c ++++ b/src/fluent-bit.c +@@ -289,7 +289,7 @@ static int input_set_property(struct flb_input_instance *in, char *kv) + in->p->name, key); + } + +- flb_free(key); ++ mk_mem_free(key); + return ret; + } + +@@ -314,7 +314,7 @@ static int output_set_property(struct flb_output_instance *out, char *kv) + } + + ret = flb_output_set_property(out, key, value); +- flb_free(key); ++ mk_mem_free(key); + return ret; + } + +@@ -340,7 +340,7 @@ static int filter_set_property(struct flb_filter_instance *filter, char *kv) + } + + ret = flb_filter_set_property(filter, key, value); +- flb_free(key); ++ mk_mem_free(key); + return ret; + } + diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch new file mode 100644 index 000000000..91675dfc6 --- /dev/null +++ b/meta-oe/recipes-extended/fluentbit/fluentbit/0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch @@ -0,0 +1,82 @@ +From 7c3b1dfb174312594d3317c24ed71c60398f653f Mon Sep 17 00:00:00 2001 +From: Ramon Fried <[email protected]> +Date: Wed, 10 Feb 2021 04:23:36 +0200 +Subject: [PATCH] parser: Fix SIGSEGV caused by using flb_free instead of + mk_mem_free + +Upstream-Status: Backport (fix only for 1.3.5) +Signed-off-by: Ramon Fried <[email protected]> +--- + src/flb_parser.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/src/flb_parser.c b/src/flb_parser.c +index d35c568..7c20e12 100644 +--- a/src/flb_parser.c ++++ b/src/flb_parser.c +@@ -490,7 +490,7 @@ int flb_parser_conf_file(const char *file, struct flb_config *config) + MK_RCONF_STR); + if (str) { + time_keep = flb_utils_bool(str); +- flb_free(str); ++ mk_mem_free(str); + } + else { + time_keep = FLB_FALSE; +@@ -522,23 +522,23 @@ int flb_parser_conf_file(const char *file, struct flb_config *config) + + flb_debug("[parser] new parser registered: %s", name); + +- flb_free(name); +- flb_free(format); ++ mk_mem_free(name); ++ mk_mem_free(format); + + if (regex) { +- flb_free(regex); ++ mk_mem_free(regex); + } + if (time_fmt) { +- flb_free(time_fmt); ++ mk_mem_free(time_fmt); + } + if (time_key) { +- flb_free(time_key); ++ mk_mem_free(time_key); + } + if (time_offset) { +- flb_free(time_offset); ++ mk_mem_free(time_offset); + } + if (types_str) { +- flb_free(types_str); ++ mk_mem_free(types_str); + } + + decoders = NULL; +@@ -548,19 +548,19 @@ int flb_parser_conf_file(const char *file, struct flb_config *config) + return 0; + + fconf_error: +- flb_free(name); +- flb_free(format); ++ mk_mem_free(name); ++ mk_mem_free(format); + if (regex) { +- flb_free(regex); ++ mk_mem_free(regex); + } + if (time_fmt) { +- flb_free(time_fmt); ++ mk_mem_free(time_fmt); + } + if (time_key) { +- flb_free(time_key); ++ mk_mem_free(time_key); + } + if (types_str) { +- flb_free(types_str); ++ mk_mem_free(types_str); + } + if (decoders) { + flb_parser_decoder_list_destroy(decoders); diff --git a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb index 0b7d11e16..eac267041 100644 --- a/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb +++ b/meta-oe/recipes-extended/fluentbit/fluentbit_1.3.5.bb @@ -16,7 +16,9 @@ SRC_URI = "http://fluentbit.io/releases/1.3/fluent-bit-${PV}.tar.gz \ file://cross-build-init-system-detection.patch \ file://builtin-nan.patch \ file://0001-ppc-Fix-signature-for-co_create-API.patch \ - " + file://0001-bin-fix-SIGSEGV-caused-by-using-flb_free-instead-of-.patch \ + file://0002-parser-Fix-SIGSEGV-caused-by-using-flb_free-instead-.patch \ + " SRC_URI[md5sum] = "6eae6dfd0a874e5dd270c36e9c68f747" SRC_URI[sha256sum] = "e037c76c89269c8dc4027a08e442fefd2751b0f1e0f9c38f9a4b12d781a9c789" -- 2.17.1
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#89462): https://lists.openembedded.org/g/openembedded-devel/message/89462 Mute This Topic: https://lists.openembedded.org/mt/80526583/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
