aboutsummaryrefslogtreecommitdiffstats
path: root/arch/powerpc/include
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2011-08-10 20:44:24 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2011-11-11 09:37:10 -0800
commit55a6bcf9d9a66921b7a7a854ca86356e901114fe (patch)
tree6f98695256440dcc786672daa11e796b3cba2cee /arch/powerpc/include
parent2b7940d84f184ad4b71cf66465bb55212d3b3fd8 (diff)
downloadkernel_samsung_smdk4412-55a6bcf9d9a66921b7a7a854ca86356e901114fe.zip
kernel_samsung_smdk4412-55a6bcf9d9a66921b7a7a854ca86356e901114fe.tar.gz
kernel_samsung_smdk4412-55a6bcf9d9a66921b7a7a854ca86356e901114fe.tar.bz2
powerpc: Fix oops when echoing bad values to /sys/devices/system/memory/probe
commit a11940978bd598e65996b4f807cf4904793f7025 upstream. If we echo an address the hypervisor doesn't like to /sys/devices/system/memory/probe we oops the box: # echo 0x10000000000 > /sys/devices/system/memory/probe kernel BUG at arch/powerpc/mm/hash_utils_64.c:541! The backtrace is: create_section_mapping arch_add_memory add_memory memory_probe_store sysdev_class_store sysfs_write_file vfs_write SyS_write In create_section_mapping we BUG if htab_bolt_mapping returned an error. A better approach is to return an error which will propagate back to userspace. Rerunning the test with this patch applied: # echo 0x10000000000 > /sys/devices/system/memory/probe -bash: echo: write error: Invalid argument Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'arch/powerpc/include')
-rw-r--r--arch/powerpc/include/asm/sparsemem.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/include/asm/sparsemem.h b/arch/powerpc/include/asm/sparsemem.h
index 54a47ea..0c5fa31 100644
--- a/arch/powerpc/include/asm/sparsemem.h
+++ b/arch/powerpc/include/asm/sparsemem.h
@@ -16,7 +16,7 @@
#endif /* CONFIG_SPARSEMEM */
#ifdef CONFIG_MEMORY_HOTPLUG
-extern void create_section_mapping(unsigned long start, unsigned long end);
+extern int create_section_mapping(unsigned long start, unsigned long end);
extern int remove_section_mapping(unsigned long start, unsigned long end);
#ifdef CONFIG_NUMA
extern int hot_add_scn_to_nid(unsigned long scn_addr);