perf/x86/intel: Plug memory leak in intel_pmu_init()
authorThomas Gleixner <tglx@linutronix.de>
Wed, 27 Dec 2017 18:45:31 +0000 (19:45 +0100)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 27 Dec 2017 19:23:59 +0000 (20:23 +0100)
commit7ad1437d6ace0e450a6c1167720608ad660b191d
treeb518b1fd266c0f025683e91178ecd42e283b55bc
parent2e36463525b8b63b32be0721d0268e336d314b38
perf/x86/intel: Plug memory leak in intel_pmu_init()

A recent commit introduced an extra merge_attr() call in the skylake
branch, which causes a memory leak.

Store the pointer to the extra allocated memory and free it at the end of
the function.

Fixes: a5df70c354c2 ("perf/x86: Only show format attributes when supported")
Reported-by: Tommi Rantala <tommi.t.rantala@nokia.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Andi Kleen <ak@linux.intel.com>
arch/x86/events/intel/core.c