perf session: check for null pointer before derefernce
PATCH 1/1 perf session: check for null pointer before derefernce
Move null pointer check before dereferncing the variable
Addresses-Coverity: 1497622 ("Derereference before null check")
--- tools/perf/util/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/session.c +1 -1
@@ -1503,11 +1503,11 @@ static int machines__deliver_event(struct machines *machines, ++evlist->stats.nr_unknown_id;return 0 ; } -dump_sample (evsel, event, sample,perf_env__arch (machine->env));if (machine ==NULL ) { ++evlist->stats.nr_unprocessable_samples;return 0 ; } +dump_sample (evsel, event, sample,perf_env__arch (machine->env));return evlist__deliver_sample (evlist, tool, event, sample, evsel, machine);case PERF_RECORD_MMAP :return tool->mmap (tool, event, sample, machine);
Signature · 1 line
2.25.1
Quoted 17 lines · Ameer Hamza
Move null pointer check before dereferncing the variable
Addresses-Coverity: 1497622 ("Derereference before null check")
Signed-off-by Ameer Hamza <[email protected]>--- tools/perf/util/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/session.c +0
-0@@ -1503,11 +1503,11 @@ static int machines__deliver_event(struct machines *machines, ++evlist->stats.nr_unknown_id;return 0 ;
tools/perf/util/session.c static int machines__deliver_event(struct machines *machines, · line 1513
Quoted 10 lines
tools/perf/util/session.c +1
-1} -dump_sample (evsel, event, sample,perf_env__arch (machine->env));if (machine ==NULL ) { ++evlist->stats.nr_unprocessable_samples;return 0 ; } +dump_sample (evsel, event, sample,perf_env__arch (machine->env));return evlist__deliver_sample (evlist, tool, event, sample, evsel, machine);case PERF_RECORD_MMAP :return tool->mmap (tool, event, sample, machine);
Hi Ameer,
This mistake was made recently, but I don't think your change is the desired behavior.
It should be possible to dump stuff if machine is null. null or an empty string should be passed to dump_sample(). It looks like some of the printfs still attempt to show something in this case, although I didn't check them all.
James
Quoted 33 lines · James Clark
Quoted 17 lines · Ameer Hamza
Move null pointer check before dereferncing the variable
Addresses-Coverity: 1497622 ("Derereference before null check")
Signed-off-by Ameer Hamza <[email protected]>--- tools/perf/util/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/session.c +0
-0@@ -1503,11 +1503,11 @@ static int machines__deliver_event(struct machines *machines, ++evlist->stats.nr_unknown_id;return 0 ;tools/perf/util/session.c static int machines__deliver_event(struct machines *machines, · line 1513
Quoted 10 lines
tools/perf/util/session.c +1
-1} -dump_sample (evsel, event, sample,perf_env__arch (machine->env));if (machine ==NULL ) { ++evlist->stats.nr_unprocessable_samples;return 0 ; } +dump_sample (evsel, event, sample,perf_env__arch (machine->env));return evlist__deliver_sample (evlist, tool, event, sample, evsel, machine);case PERF_RECORD_MMAP :return tool->mmap (tool, event, sample, machine);Hi Ameer,
Quoted 5 lines
This mistake was made recently, but I don't think your change is the desired behavior.
It should be possible to dump stuff if machine is null. null or an empty string should be passed to
dump_sample(). It looks like some of the printfs still attempt to show something in this case, although I didn't check them all.
Hi James,
Thank you for your response. I understand your point.
Do you think following changes would be ok?
tools/perf/util/session.c +2 -1
@@ -1503,11 +1503,12 @@ static int machines__deliver_event(struct machines *machines, ++evlist->stats.nr_unknown_id;return 0 ; } -dump_sample (evsel, event, sample,perf_env__arch (machine->env));if (machine ==NULL ) { ++evlist->stats.nr_unprocessable_samples; +dump_sample (evsel, event, sample,perf_env__arch (NULL ));return 0 ; } +dump_sample (evsel, event, sample,perf_env__arch (machine->env));return evlist__deliver_sample (evlist, tool, event, sample, evsel, machine);case PERF_RECORD_MMAP :return tool->mmap (tool, event, sample, machine);
Thanks,
Hamza
James Clark
Reviewed-byQuoted 40 lines · Ameer Hamza
Quoted 33 lines · James Clark
Quoted 17 lines · Ameer Hamza
Move null pointer check before dereferncing the variable
Addresses-Coverity: 1497622 ("Derereference before null check")
Signed-off-by Ameer Hamza <[email protected]>--- tools/perf/util/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/session.c +0
-0@@ -1503,11 +1503,11 @@ static int machines__deliver_event(struct machines *machines, ++evlist->stats.nr_unknown_id;return 0 ;tools/perf/util/session.c static int machines__deliver_event(struct machines *machines, · line 1513
Quoted 10 lines
tools/perf/util/session.c +1
-1} -dump_sample (evsel, event, sample,perf_env__arch (machine->env));if (machine ==NULL ) { ++evlist->stats.nr_unprocessable_samples;return 0 ; } +dump_sample (evsel, event, sample,perf_env__arch (machine->env));return evlist__deliver_sample (evlist, tool, event, sample, evsel, machine);case PERF_RECORD_MMAP :return tool->mmap (tool, event, sample, machine);Hi Ameer,
Quoted 5 lines
This mistake was made recently, but I don't think your change is the desired behavior.
It should be possible to dump stuff if machine is null. null or an empty string should be passed to
dump_sample(). It looks like some of the printfs still attempt to show something in this case, although I didn't check them all.
Quoted 5 lines
Hi James,
Thank you for your response. I understand your point.
Do you think following changes would be ok?
Yep looks good. With that change:
Quoted 23 lines
tools/perf/util/session.c +2
-1@@ -1503,11 +1503,12 @@ static int machines__deliver_event(struct machines *machines, ++evlist->stats.nr_unknown_id;return 0 ; } -dump_sample (evsel, event, sample,perf_env__arch (machine->env));if (machine ==NULL ) { ++evlist->stats.nr_unprocessable_samples; +dump_sample (evsel, event, sample,perf_env__arch (NULL ));return 0 ; } +dump_sample (evsel, event, sample,perf_env__arch (machine->env));return evlist__deliver_sample (evlist, tool, event, sample, evsel, machine);case PERF_RECORD_MMAP :return tool->mmap (tool, event, sample, machine);Thanks,
Hamza
PATCH v2 1/1 perf session: check for null pointer before derefernce
Move null pointer check before dereferncing the variable
Addresses-Coverity: 1497622 ("Derereference before null check")
---
v1 -> v2: It should be possible to dump stuff if machine is NULL.
--- tools/perf/util/session.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/util/session.c +2 -1
@@ -1503,11 +1503,12 @@ static int machines__deliver_event(struct machines *machines, ++evlist->stats.nr_unknown_id;return 0 ; } -dump_sample (evsel, event, sample,perf_env__arch (machine->env));if (machine ==NULL ) { ++evlist->stats.nr_unprocessable_samples; +dump_sample (evsel, event, sample,perf_env__arch (NULL ));return 0 ; } +dump_sample (evsel, event, sample,perf_env__arch (machine->env));return evlist__deliver_sample (evlist, tool, event, sample, evsel, machine);case PERF_RECORD_MMAP :return tool->mmap (tool, event, sample, machine);
Signature · 1 line
2.25.1
Em Tue, Jan 25, 2022 at 09:35:49AM +0000, James Clark escreveu:
Quoted 45 lines · Ameer Hamza
Quoted 42 lines · James Clark
Quoted 33 lines · Ameer Hamza
Quoted 17 lines
Move null pointer check before dereferncing the variable
Addresses-Coverity: 1497622 ("Derereference before null check")
Signed-off-by Ameer Hamza <[email protected]>--- tools/perf/util/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)tools/perf/util/session.c +0
-0@@ -1503,11 +1503,11 @@ static int machines__deliver_event(struct machines *machines, ++evlist->stats.nr_unknown_id;return 0 ;tools/perf/util/session.c static int machines__deliver_event(struct machines *machines, · line 1513
Quoted 10 lines
tools/perf/util/session.c +1
-1} -dump_sample (evsel, event, sample,perf_env__arch (machine->env));if (machine ==NULL ) { ++evlist->stats.nr_unprocessable_samples;return 0 ; } +dump_sample (evsel, event, sample,perf_env__arch (machine->env));return evlist__deliver_sample (evlist, tool, event, sample, evsel, machine);case PERF_RECORD_MMAP :return tool->mmap (tool, event, sample, machine);Hi Ameer,
Quoted 5 lines
This mistake was made recently, but I don't think your change is the desired behavior.
It should be possible to dump stuff if machine is null. null or an empty string should be passed to
dump_sample(). It looks like some of the printfs still attempt to show something in this case, although I didn't check them all.Hi James,
Quoted 7 lines
Quoted 3 lines
Thank you for your response. I understand your point.
Do you think following changes would be ok?
Yep looks good. With that change:
Reviewed-by James Clark <[email protected]>
Thanks, applied.
- Arnaldo
Quoted 23 lines
Quoted 23 lines
tools/perf/util/session.c +2
-1@@ -1503,11 +1503,12 @@ static int machines__deliver_event(struct machines *machines, ++evlist->stats.nr_unknown_id;return 0 ; } -dump_sample (evsel, event, sample,perf_env__arch (machine->env));if (machine ==NULL ) { ++evlist->stats.nr_unprocessable_samples; +dump_sample (evsel, event, sample,perf_env__arch (NULL ));return 0 ; } +dump_sample (evsel, event, sample,perf_env__arch (machine->env));return evlist__deliver_sample (evlist, tool, event, sample, evsel, machine);case PERF_RECORD_MMAP :return tool->mmap (tool, event, sample, machine);Thanks,
Hamza
Signature · 1 line
- Arnaldo