Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af2d237b authored by Akinobu Mita's avatar Akinobu Mita Committed by Ingo Molnar
Browse files

x86: check for ioremap() failure in copy_oldmem_page() 



Add a check for ioremap() failure in copy_oldmem_page().
This patch also includes small coding style fixes.

Signed-off-by: default avatarAkinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 72d31053

arch/x86/kernel/crash_dump_64.c

+4 −2
Original line number Diff line number Diff line
@@ -33,14 +33,16 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf, 
		return 0;



	vaddr = ioremap(pfn << PAGE_SHIFT, PAGE_SIZE);

	if (!vaddr)

		return -ENOMEM;



	if (userbuf) {

		if (copy_to_user(buf, (vaddr + offset), csize)) {

		if (copy_to_user(buf, vaddr + offset, csize)) {

			iounmap(vaddr);

			return -EFAULT;

		}

	} else

	memcpy(buf, (vaddr + offset), csize);

		memcpy(buf, vaddr + offset, csize);



	iounmap(vaddr);

	return csize;