perf expr: Fix missing check for return value of hashmap__new
PATCH 1/1 perf expr: Fix missing check for return value of hashmap__new
The hashmap__new() function may return ERR_PTR(-ENOMEM) when malloc fails, add IS_ERR checking for ctx->ids.
--- tools/perf/util/expr.c | 4 ++++ 1 file changed, 4 insertions(+)
tools/perf/util/expr.c +4 -0
@@ -299,6 +299,10 @@ struct expr_parse_ctx *expr__ctx_new(void)return NULL ; ctx->ids =hashmap__new (key_hash, key_equal,NULL ); +if (IS_ERR (ctx->ids)) { +kfree (ctx); +return NULL ; + } ctx->runtime =0 ;return ctx;
Signature · 1 line
2.17.1
Em Sun, Dec 12, 2021 at 06:25:02AM +0000, Miaoqian Lin escreveu:
Quoted 4 lines
The
hashmap__new()function may returnERR_PTR(-ENOMEM)when malloc fails, addIS_ERRchecking forctx->ids.Signed-off-by Miaoqian Lin <[email protected]>
Thanks, applied.
As a follow up you may consider using ids__new() instead:
struct hashmap *ids__new(void)
{
return hashmap__new(key_hash, key_equal, NULL);
}And I noticed that the users of ids__new() are not using IS_ERR() on its return in tools/perf/tests/expr.c, e.g.:
static int test_ids_union(void)
{
struct hashmap *ids1, *ids2;
/* Empty union. */
ids1 = ids__new();
TEST_ASSERT_VAL("ids__new", ids1);
ids2 = ids__new();
TEST_ASSERT_VAL("ids__new", ids2);This needs converting to TEST_ASSERT_VAL_IS_ERR() probably after introducing it, I haven't checked if this variation exists.
- Arnaldo
Quoted 21 lines
--- tools/perf/util/expr.c | 4 ++++ 1 file changed, 4 insertions(+)tools/perf/util/expr.c +4
-0@@ -299,6 +299,10 @@ struct expr_parse_ctx *expr__ctx_new(void)return NULL ; ctx->ids =hashmap__new (key_hash, key_equal,NULL ); +if (IS_ERR (ctx->ids)) { +kfree (ctx); +return NULL ; + } ctx->runtime =0 ;return ctx;Signature · 1 line
2.17.1
Signature · 1 line
- Arnaldo
Arnaldo Carvalho de Melo
maintainerEm Mon, Dec 13, 2021 at 10:06:02AM -0300, Arnaldo Carvalho de Melo escreveu:
Quoted 7 lines
Em Sun, Dec 12, 2021 at 06:25:02AM +0000, Miaoqian Lin escreveu:
Quoted 4 lines
The
hashmap__new()function may returnERR_PTR(-ENOMEM)when malloc fails, addIS_ERRchecking forctx->ids.Signed-off-by Miaoqian Lin <[email protected]>Thanks, applied.
I take that back, kfree()? Are you compile testing this?
CC /tmp/build/perf/util/expr.outil/expr.c: In function ‘expr__ctx_new’:util/expr.c:302:13: error: implicit declaration of function ‘IS_ERR’ [-Werror=implicit-function-declaration]
302 | if (IS_ERR(ctx->ids)) {
| ^~~~~~
util/expr.c:303:17: error: implicit declaration of function ‘kfree’; did you mean ‘free’? [-Werror=implicit-function-declaration]
303 | kfree(ctx);
| ^~~~~
| freecc1: all warnings being treated as errors
I had to fix it applying this on top, please compile test your patches.
- Arnaldo
tools/perf/util/expr.c +2 -1
@@ -12,6 +12,7 @@#include "expr-bison.h" #include "expr-flex.h" #include "smt.h" +#include <linux/err.h> #include <linux/kernel.h> #include <linux/zalloc.h> #include <ctype.h>
@@ -300,7 +301,7 @@ struct expr_parse_ctx *expr__ctx_new(void) ctx->ids =hashmap__new (key_hash, key_equal,NULL );if (IS_ERR (ctx->ids)) { -kfree (ctx); +free (ctx);return NULL ; } ctx->runtime =0 ;