Re: [PATCH 3.8-stable] perf: Fix error return code
From: Luis Henriques
Date: Tue Apr 23 2013 - 06:57:11 EST
On Tue, Apr 23, 2013 at 11:57:51AM +0900, Jonghwan Choi wrote:
> 3.8-stable review patch. If anyone has any objections, please let me know.
Thanks, I believe this is also applicable to 3.2.y, 3.4.y and 3.5.y.
Cheers,
--
Luis
>
> ------------------
>
> From: "Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>"
>
> commit c481420248c6730246d2a1b1773d5d7007ae0835 upstream.
>
> Fix to return -ENOMEM in the allocation error case instead of 0
> (if pmu_bus_running == 1), as done elsewhere in this function.
>
> Signed-off-by: Wei Yongjun <yongjun_wei@xxxxxxxxxxxxxxxxx>
> Cc: a.p.zijlstra@xxxxxxxxx
> Cc: paulus@xxxxxxxxx
> Cc: acme@xxxxxxxxxxxxxxxxxx
> Link:
> http://lkml.kernel.org/r/CAPgLHd8j_fWcgqe%3DKLWjpBj%2B%3Do0Pw6Z-SEq%3DNTPU08
> c2w1tngQ@xxxxxxxxxxxxxx
> [ Tweaked the error code setting placement and the changelog. ]
> Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
> Signed-off-by: Jonghwan Choi <jhbird.choi@xxxxxxxxxxx>
> ---
> kernel/events/core.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/kernel/events/core.c b/kernel/events/core.c
> index 7b6646a..f6eba58 100644
> --- a/kernel/events/core.c
> +++ b/kernel/events/core.c
> @@ -5988,6 +5988,7 @@ skip_type:
> if (pmu->pmu_cpu_context)
> goto got_cpu_context;
>
> + ret = -ENOMEM;
> pmu->pmu_cpu_context = alloc_percpu(struct perf_cpu_context);
> if (!pmu->pmu_cpu_context)
> goto free_dev;
> --
> 1.7.9.5
>
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
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/