diff options
| author |   Andrea Adami <andrea.adami@gmail.com> | 2013-07-18 23:10:54 +0200 |
|---|---|---|
| committer | Andrea Adami <andrea.adami@gmail.com> | 2013-07-19 00:59:17 +0200 |
| commit | c56c7533bcfa3af51e3b3362b9f2e666328b1d29 (patch) | |
| tree | abf33b15d9b333e9fe6dce1e50b7418ae3107ac8 | |
| parent | 3c6e0afb33f526793b67609be3c192245eaf7482 (diff) | |
| download | meta-handheld-c56c7533bcfa3af51e3b3362b9f2e666328b1d29.tar.gz | |
linux-yocto_3.8: sharpsl_param.patch: refactor for upstream submission
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
| -rw-r--r-- | recipes-kernel/linux/linux-yocto-3.8/patches/patches-pxa/sharpsl_param.patch | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/recipes-kernel/linux/linux-yocto-3.8/patches/patches-pxa/sharpsl_param.patch b/recipes-kernel/linux/linux-yocto-3.8/patches/patches-pxa/sharpsl_param.patch index 720a87c..934cdca 100644 --- a/recipes-kernel/linux/linux-yocto-3.8/patches/patches-pxa/sharpsl_param.patch +++ b/recipes-kernel/linux/linux-yocto-3.8/patches/patches-pxa/sharpsl_param.patch @@ -1,17 +1,23 @@ -* Unbreak kernel boot (tested with kexecboot) -* Patch was sent twice upstrream: -* http://lists.infradead.org/pipermail/linux-arm-kernel/2012-December/137284.html -* -* Devices that call sharpsl_save_param() will hang on boot due to -* a memcpy call that uses a physical address that is no longer -* accessible. Fix this by converting the physical address into a virtual one. +From a8ca187342e1db8bf2f770b0d95935d2cbf1cc3c Mon Sep 17 00:00:00 2001 +From: Marko Katic <dromede@gmail.com> +Date: Mon, 15 Jul 2013 00:57:22 +0200 +Subject: [PATCH] sharpsl_param: fix invalid memory access in + sharpsl_save_param() -Signed-off-by: Marko Katic <dromede.gmail.com> +Unbreak kernel boot (tested with kexecboot) + +Patch was sent twice upstrream: +http://lists.infradead.org/pipermail/linux-arm-kernel/2012-December/137284.html +Devices that call sharpsl_save_param() will hang on boot due to +a memcpy call that uses a physical address that is no longer * accessible. Fix +his by converting the physical address into a virtual one. + +Signed-off-by: Marko Katic <dromede@gmail.com> Upstream-Status: Submitted https://patchwork.kernel.org/patch/1818681/ --- - arch/arm/common/sharpsl_param.c | 4 +++- + arch/arm/common/sharpsl_param.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/common/sharpsl_param.c b/arch/arm/common/sharpsl_param.c @@ -31,8 +37,11 @@ index d56c932..b70b13a 100644 void sharpsl_save_param(void) { - memcpy(&sharpsl_param, (void *)PARAM_BASE, sizeof(struct sharpsl_param_info)); -+ void * param_start = phys_to_virt(PARAM_BASE); ++ void *param_start = phys_to_virt(PARAM_BASE); + memcpy(&sharpsl_param, param_start, sizeof(struct sharpsl_param_info)); if (sharpsl_param.comadj_keyword != COMADJ_MAGIC) sharpsl_param.comadj=-1; +-- +1.8.1.5 + |