perf pmu: Avoid uninitialized use of alias->str
Ian Rogers
reviewerPATCH 1/1 perf pmu: Avoid uninitialized use of alias->str
alias is allocated with malloc allowing uninitialized memory to be accessed. The initialization of str was moved late after it could have been updated by a JSON event, however, this create a potential for an uninitialized use. Fix this by assigning str to NULL early. Testing on ARM (Raspberry Pi) showed a memory leak in the same code so add a zfree.
--- tools/perf/util/pmu.c | 2 ++ 1 file changed, 2 insertions(+)
tools/perf/util/pmu.c +2 -0
@@ -532,6 +532,7 @@ static int perf_pmu__new_alias(struct perf_pmu *pmu, const char *name,if (!alias)return -ENOMEM ; + alias->str =NULL ;INIT_LIST_HEAD (&alias->terms); alias->scale =1.0 ; alias->unit[0 ] ='\0' ;
@@ -593,6 +594,7 @@ static int perf_pmu__new_alias(struct perf_pmu *pmu, const char *name, ret +=scnprintf (newval + ret,sizeof (newval) - ret,"%s=%s" , term->config, term->val.str); } +zfree (&alias->str); alias->str =strdup (newval);if (!pe) pmu->sysfs_aliases++;
Signature · 1 line
2.42.0.rc2.253.gd59a3bf2b4-goog
Hi Ian,
Quoted 10 lines · Ian Rogers
alias is allocated with malloc allowing uninitialized memory to be accessed. The initialization of str was moved late after it could have been updated by a JSON event, however, this create a potential for an uninitialized use. Fix this by assigning str to NULL early. Testing on ARM (Raspberry Pi) showed a memory leak in the same code so add a zfree.
Fixes f63a536f03a2 ("perf pmu: Merge JSON events with sysfs at load time")Signed-off-by Ian Rogers <[email protected]>
Thanks,
Namhyung
Quoted 27 lines
--- tools/perf/util/pmu.c | 2 ++ 1 file changed, 2 insertions(+)tools/perf/util/pmu.c +2
-1@@ -532,6 +532,7 @@ static int perf_pmu__new_alias(struct perf_pmu *pmu, const char *name,if (!alias)return -ENOMEM ; + alias->str =NULL ;INIT_LIST_HEAD (&alias->terms); alias->scale =1.0 ; alias->unit[0 ] ='\0' ;@@ -593,6 +594,7 @@ static int perf_pmu__new_alias(struct perf_pmu *pmu, const char *name, ret +=scnprintf (newval + ret,sizeof (newval) - ret,"%s=%s" , term->config, term->val.str); } +zfree (&alias->str); alias->str =strdup (newval);if (!pe) pmu->sysfs_aliases++; --2.42.0.rc2.253.gd59a3bf2b4-goog
Em Tue, Aug 29, 2023 at 07:23:58PM -0700, Namhyung Kim escreveu:
Quoted 11 lines
Hi Ian,
Quoted 8 lines · Ian Rogers
alias is allocated with malloc allowing uninitialized memory to be accessed. The initialization of str was moved late after it could have been updated by a JSON event, however, this create a potential for an uninitialized use. Fix this by assigning str to NULL early. Testing on ARM (Raspberry Pi) showed a memory leak in the same code so add a zfree.
Quoted 4 lines
Quoted 2 lines
Fixes f63a536f03a2 ("perf pmu: Merge JSON events with sysfs at load time")Signed-off-by Ian Rogers <[email protected]>Acked-by Namhyung Kim <[email protected]>
Thanks, applied.
- Arnaldo
Quoted 31 lines
Thanks,
NamhyungQuoted 27 lines
--- tools/perf/util/pmu.c | 2 ++ 1 file changed, 2 insertions(+)tools/perf/util/pmu.c +2
-1@@ -532,6 +532,7 @@ static int perf_pmu__new_alias(struct perf_pmu *pmu, const char *name,if (!alias)return -ENOMEM ; + alias->str =NULL ;INIT_LIST_HEAD (&alias->terms); alias->scale =1.0 ; alias->unit[0 ] ='\0' ;@@ -593,6 +594,7 @@ static int perf_pmu__new_alias(struct perf_pmu *pmu, const char *name, ret +=scnprintf (newval + ret,sizeof (newval) - ret,"%s=%s" , term->config, term->val.str); } +zfree (&alias->str); alias->str =strdup (newval);if (!pe) pmu->sysfs_aliases++; --2.42.0.rc2.253.gd59a3bf2b4-goog
Signature · 1 line
- Arnaldo