Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752219Ab3IRXSs (ORCPT ); Wed, 18 Sep 2013 19:18:48 -0400 Received: from mail-ea0-f178.google.com ([209.85.215.178]:46528 "EHLO mail-ea0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751668Ab3IRXSr (ORCPT ); Wed, 18 Sep 2013 19:18:47 -0400 From: Andrea Adami To: linux-arm-kernel@lists.infradead.org Cc: arm@kernel.org, Olof Johansson , Marko Katic , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH v3] ARM: pxa: sharpsl_param.c: fix invalid memory access Date: Thu, 19 Sep 2013 01:18:39 +0200 Message-Id: <1379546319-29165-1-git-send-email-andrea.adami@gmail.com> X-Mailer: git-send-email 1.8.1.5 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2284 Lines: 68 After commit 72662e01088394577be4a3f14da94cf87bea2591 ARM: head.S: only include __turn_mmu_on in the initial identity mapping Zaurus PXA devices call sharpsl_save_param() during fixup and hang on boot because memcpy refers to physical addresses no longer valid if the MMU is setup. Zaurus collie (SA1100) is unaffected (function is called in init_machine). Signed-off-by: Marko Katic Signed-off-by: Andrea Adami --- arch/arm/common/sharpsl_param.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c index d56c932..4dcd349 100644 --- a/arch/arm/common/sharpsl_param.c +++ b/arch/arm/common/sharpsl_param.c @@ -15,6 +15,7 @@ #include #include #include +#include /* * Certain hardware parameters determined at the time of device manufacture, @@ -23,6 +24,8 @@ * them early in the boot process, then pass them to the appropriate drivers. * Not all devices use all parameters but the format is common to all. */ + + #ifdef CONFIG_ARCH_SA1100 #define PARAM_BASE 0xe8ffc000 #else @@ -41,7 +44,17 @@ EXPORT_SYMBOL(sharpsl_param); void sharpsl_save_param(void) { - memcpy(&sharpsl_param, (void *)PARAM_BASE, sizeof(struct sharpsl_param_info)); +/* NOTE: + * Zaurus PXA devices call sharpsl_save_param() during fixup and the MMU + * is setup so we need to translate the physical address. + * Zaurus collie (SA1100) is unaffected (function is called in init_machine). + */ +#ifdef CONFIG_ARCH_SA1100 + void *param_start = (void *)PARAM_BASE; +#else + void *param_start = phys_to_virt(PARAM_BASE); +#endif + memcpy(&sharpsl_param, param_start, sizeof(struct sharpsl_param_info)); if (sharpsl_param.comadj_keyword != COMADJ_MAGIC) sharpsl_param.comadj=-1; @@ -58,5 +71,3 @@ void sharpsl_save_param(void) if (sharpsl_param.adadj_keyword != AD_MAGIC) sharpsl_param.adadj=-1; } - - -- 1.8.1.5 -- 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/