lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[MIPS] VPE loader: Check result of memory allocation.

Browse Source 
And while at it, make it a little cleaner.  Issue originally reported by
Tiejun Chen (tiejun.chen@windriver.com).

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
This commit is contained in:
Ralf Baechle
2008-03-13 15:16:53 +00:00
parent a9edadbf79
commit 5408c490a4
1 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
arch/mips/kernel/vpe.c
View File

@@ -262,13 +262,21 @@ void dump_mtregs(void)
/* Find some VPE program space */ /* Find some VPE program space */
static void *alloc_progmem(unsigned long len) static void *alloc_progmem(unsigned long len)
{ {
void *addr;
#ifdef CONFIG_MIPS_VPE_LOADER_TOM #ifdef CONFIG_MIPS_VPE_LOADER_TOM
/* this means you must tell linux to use less memory than you physically have */ /*
return pfn_to_kaddr(max_pfn); * This means you must tell Linux to use less memory than you
* physically have, for example by passing a mem= boot argument.
*/
addr = pfn_to_kaddr(max_pfn);
memset(addr, 0, len);
#else #else
// simple grab some mem for now /* simple grab some mem for now */
return kmalloc(len, GFP_KERNEL); addr = kzalloc(len, GFP_KERNEL);
#endif #endif
return addr;
} }
static void release_progmem(void *ptr) static void release_progmem(void *ptr)
@@ -884,9 +892,10 @@ static int vpe_elfload(struct vpe * v)
} }
v->load_addr = alloc_progmem(mod.core_size); v->load_addr = alloc_progmem(mod.core_size);
memset(v->load_addr, 0, mod.core_size); if (!v->load_addr)
return -ENOMEM;
printk("VPE loader: loading to %p\n", v->load_addr); pr_info("VPE loader: loading to %p\n", v->load_addr);
if (relocate) { if (relocate) {
for (i = 0; i < hdr->e_shnum; i++) { for (i = 0; i < hdr->e_shnum; i++) {