2013-04-12 03:05:56

by Wei Yongjun

Subject: [PATCH -next] perf: fix error return code

From: Wei Yongjun <[email protected]>

Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in this function.

Signed-off-by: Wei Yongjun <[email protected]>
---
kernel/events/core.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 2427107..7504140 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -6033,8 +6033,10 @@ skip_type:
goto got_cpu_context;

pmu->pmu_cpu_context = alloc_percpu(struct perf_cpu_context);
- if (!pmu->pmu_cpu_context)
+ if (!pmu->pmu_cpu_context) {
+ ret = -ENOMEM;
goto free_dev;
+ }

for_each_possible_cpu(cpu) {
struct perf_cpu_context *cpuctx;

2013-04-14 16:05:54

by tip-bot for Vasyl Gomonovych

Subject: [tip:perf/urgent] perf: Fix error return code

Commit-ID: c481420248c6730246d2a1b1773d5d7007ae0835
Gitweb: http://git.kernel.org/tip/c481420248c6730246d2a1b1773d5d7007ae0835
Author: Wei Yongjun <[email protected]>
AuthorDate: Fri, 12 Apr 2013 11:05:54 +0800
Committer: Ingo Molnar <[email protected]>
CommitDate: Fri, 12 Apr 2013 06:33:56 +0200

perf: Fix error return code

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 <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
Link: http://lkml.kernel.org/r/CAPgLHd8j_fWcgqe%3DKLWjpBj%2B%3Do0Pw6Z-SEq%[email protected]
[ Tweaked the error code setting placement and the changelog. ]
Signed-off-by: Ingo Molnar <[email protected]>
---
kernel/events/core.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/kernel/events/core.c b/kernel/events/core.c
index 7f0d67e..7e0962e 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -5987,6 +5987,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;