Re: [PATCH] tools: perf: util: session.c: Cleaning up inconsistent NULL checks

[Rickard Strandqvist]

Okay, I wrote a patch with many errors in relation to how you want
your patches on 3 of May. Maybe from there.
But good, then this fix is included :)


Best regards
Rickard Strandqvist


2014-05-23 9:05 GMT+02:00 Jiri Olsa <jolsa@xxxxxxxxxx>:
> On Thu, May 22, 2014 at 11:58:36PM +0200, Rickard Strandqvist wrote:
>> Cleaning up inconsistent NULL checks.
>> There is otherwise a risk of a possible null pointer dereference.
>>
>> Was largely found by using a static code analysis program called cppcheck.
>>
>> Signed-off-by: Rickard Strandqvist <rickard_strandqvist@xxxxxxxxxxxxxxxxxx>
>> ---
>>  tools/perf/util/session.c |    4 +++-
>>  1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
>> index 55960f2..8defd80 100644
>> --- a/tools/perf/util/session.c
>> +++ b/tools/perf/util/session.c
>> @@ -1625,13 +1625,15 @@ out_delete_map:
>>  void perf_session__fprintf_info(struct perf_session *session, FILE *fp,
>>                               bool full)
>>  {
>> -     int fd = perf_data_file__fd(session->file);
>> +     int fd;
>>       struct stat st;
>>       int ret;
>>
>>       if (session == NULL || fp == NULL)
>>               return;
>>
>> +     fd = perf_data_file__fd(session->file);
>> +
>>       ret = fstat(fd, &st);
>>       if (ret == -1)
>>               return;
>> --
>> 1.7.10.4
>>
> hi,
> I merged same patch just a week ago or so ;-)
>
> perf session: Fix possible null pointer dereference in session.c
> commit c5765ece8a050836c6255e1276fc8e0e867078da
> Author: Masanari Iida <standby24x7@xxxxxxxxx>
> Date:   Thu May 15 02:13:38 2014 +0900
>
>
> thanks,
> jirka
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/