http_server: metrics: add null-dereference guards #7627
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`flb_sds_cat` can fail and return NULL, this should be checked to avoid NULL dereferences. Signed-off-by: David Korczynski <[email protected]>
DavidKorczynski
requested review from
edsiper,
leonardo-albertovich,
fujimotos and
koleini
as code owners
leonardo-albertovich
requested changes
Jun 30, 2023
src/http_server/api/v1/metrics.c
Outdated
| @@ -397,15 +397,45 @@ void cb_metrics_prometheus(mk_request_t *request, void *data) | |||
| } | |||
|
|
|||
| sds_metric = flb_sds_cat(sds_metric, "fluentbit_", 10); | |||
There was a problem hiding this comment.
Could you replace this with a single call to flb_sds_printf or at least use flb_sds_cat_safe? Otherwise these will exchange a possible NULL deref for a memory leak.
There was a problem hiding this comment.
I replaced it with flb_sds_cat_safe
DavidKorczynski
force-pushed
the
fix-metrics-nullchecks
branch
from
30558b9
to
c19a58f
Compare
Signed-off-by: David Korczynski <[email protected]>
DavidKorczynski
force-pushed
the
fix-metrics-nullchecks
branch
from
c19a58f
to
d665868
Compare
leonardo-albertovich
requested changes
Aug 8, 2023
| @@ -396,16 +396,36 @@ void cb_metrics_prometheus(mk_request_t *request, void *data) | |||
| goto error; | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
Could you please just use flb_sds_printf once here?
|
This PR is stale because it has been open 45 days with no activity. Remove stale label or comment or this will be closed in 10 days. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
flb_sds_catcan fail and return NULL, this should be checked to avoid NULL dereferences.Enter
[N/A]in the box, if an item is not applicable to your change.Testing
Before we can approve your change; please submit the following in a comment:
If this is a change to packaging of containers or native binaries then please confirm it works for all targets.
ok-package-testlabel to test for all targets (requires maintainer to do).Documentation
Backporting
Fluent Bit is licensed under Apache 2.0, by submitting this pull request I understand that this code will be released under the terms of that license.