Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753967Ab0HZTJ0 (ORCPT ); Thu, 26 Aug 2010 15:09:26 -0400 Received: from arkanian.console-pimps.org ([212.110.184.194]:47512 "EHLO arkanian.console-pimps.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753536Ab0HZTJV (ORCPT ); Thu, 26 Aug 2010 15:09:21 -0400 From: Matt Fleming To: linux-kernel@vger.kernel.org Cc: Robert Richter , Will Deacon , Paul Mundt , Russell King , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org, Peter Zijlstra , Ingo Molnar , Frederic Weisbecker , Arnaldo Carvalho de Melo , linux-arch@vger.kernel.org Subject: [PATCH 1/4] oprofile: Handle initialisation failure more gracefully Date: Thu, 26 Aug 2010 20:09:16 +0100 Message-Id: <442a16796990290ca3ebaaa3d0ab317e7b0a30a5.1282848651.git.matt@console-pimps.org> X-Mailer: git-send-email 1.7.1 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1907 Lines: 64 From: Will Deacon The current implementation is not entirely safe in the case that oprofile_arch_init() fails. We need to make sure that we always call exit_driverfs() if we've called init_driverfs(). Also, avoid a potential double free when freeing 'counter_config', e.g. don't free 'counter_config' in both oprofile_arch_init() and oprofile_arch_exit(). Signed-off-by: Will Deacon --- arch/arm/oprofile/common.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm/oprofile/common.c b/arch/arm/oprofile/common.c index 0691176..482779c 100644 --- a/arch/arm/oprofile/common.c +++ b/arch/arm/oprofile/common.c @@ -275,10 +275,12 @@ out: return ret; } -static void exit_driverfs(void) +static void exit_driverfs(void) { - platform_device_unregister(oprofile_pdev); - platform_driver_unregister(&oprofile_driver); + if (!IS_ERR_OR_NULL(oprofile_pdev)) { + platform_device_unregister(oprofile_pdev); + platform_driver_unregister(&oprofile_driver); + } } #else static int __init init_driverfs(void) { return 0; } @@ -363,10 +365,8 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) } ret = init_driverfs(); - if (ret) { - kfree(counter_config); + if (ret) return ret; - } for_each_possible_cpu(cpu) { perf_events[cpu] = kcalloc(perf_num_counters, @@ -401,8 +401,9 @@ void oprofile_arch_exit(void) int cpu, id; struct perf_event *event; + exit_driverfs(); + if (*perf_events) { - exit_driverfs(); for_each_possible_cpu(cpu) { for (id = 0; id < perf_num_counters; ++id) { event = perf_events[cpu][id]; -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/