Commit a34dbfb0 authored Nov 11, 2011 by Will Deacon Committed by Russell King Nov 12, 2011

ARM: 7160/1: setup: avoid overflowing {elf,arch}_name from proc_info_list



setup_processor copies the arch_name and elf_name fields out of the
selected proc_info_list into two fixed size buffers.

Since the proc_info_list structure is defined in a proc_*.S assembly
file, this can lead to subtle errors if the strings defined there are
too long (for example, corrupting the machine ID).

This patch uses snprintf instead of sprintf to ensure that these buffers
are not overrun.

Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

parent 798681bf

arch/arm/kernel/setup.c

+4 −2

Original line number	Diff line number	Diff line
		@@ -461,8 +461,10 @@ static void __init setup_processor(void)
		cpu_name, read_cpuid_id(), read_cpuid_id() & 15,
		proc_arch[cpu_architecture()], cr_alignment);

		sprintf(init_utsname()->machine, "%s%c", list->arch_name, ENDIANNESS);
		sprintf(elf_platform, "%s%c", list->elf_name, ENDIANNESS);
		snprintf(init_utsname()->machine, __NEW_UTS_LEN + 1, "%s%c",
		list->arch_name, ENDIANNESS);
		snprintf(elf_platform, ELF_PLATFORM_SIZE, "%s%c",
		list->elf_name, ENDIANNESS);
		elf_hwcap = list->elf_hwcap;
		#ifndef CONFIG_ARM_THUMB
		elf_hwcap &= ~HWCAP_THUMB;

Admin message