Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1361935

Re: [PATCH] perf: fix event leak when perf_event_open() failed to create event_file

Show all headers | View raw

On Mon, Mar 21, 2016 at 4:02 PM, Alexander Shishkin
<alexander.shishkin@linux.intel.com> wrote:
> Leon Yu <chianglungyu@gmail.com> writes:
>
>> If something went wrong in anon_inode_getfile, event_file will be set to
>> non-zero error number and able to bypass the NULL test afterward.
>>
>> Consolidate the error path by testing event_file with handly
>> IS_ERR_OR_NULL() helper since we do want to free event in both cases.
>>
>> Signed-off-by: Leon Yu <chianglungyu@gmail.com>
>> Fixes: 130056275ade ("perf: Do not double free")
>> Cc: <stable@vger.kernel.org> # v4.5
>> ---
>>  kernel/events/core.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/kernel/events/core.c b/kernel/events/core.c
>> index 6146148..5f2e19f 100644
>> --- a/kernel/events/core.c
>> +++ b/kernel/events/core.c
>> @@ -8617,7 +8617,7 @@ err_alloc:
>>        * If event_file is set, the fput() above will have called ->release()
>>        * and that will take care of freeing the event.
>>        */
>> -     if (!event_file)
>> +     if (IS_ERR_OR_NULL(event_file))
>>               free_event(event);
>
> By this time, we have already checked for IS_ERR(event_file) once, why
> not just fix it up there like so:

My patch is more straightforward, isn't it? :p
Anyway I don't mind which one will get merged as long as the problem is fixed.

(sorry forgot to CC all recipients)

-Leon

> @@ -9414,6 +9414,7 @@ SYSCALL_DEFINE5(perf_event_open,
>                                         f_flags);
>         if (IS_ERR(event_file)) {
>                 err = PTR_ERR(event_file);
> +               event_file = NULL;
>                 goto err_context;
>         }
>
> --
> 2.7.0
>

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH] perf: fix event leak when perf_event_open() failed to create event_file Leon Yu <chianglungyu@gmail.com> - 2016-03-20 17:00 +0100
  Re: [PATCH] perf: fix event leak when perf_event_open() failed to create event_file Alexander Shishkin <alexander.shishkin@linux.intel.com> - 2016-03-21 09:10 +0100
    Re: [PATCH] perf: fix event leak when perf_event_open() failed to  create event_file Leon Yu <chianglungyu@gmail.com> - 2016-03-21 16:30 +0100
    [tip:perf/core] perf/core: Don't leak event in the syscall error  path tip-bot for Alexander Shishkin <tipbot@zytor.com> - 2016-03-31 11:30 +0200

csiph-web