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

Commit 19da83f6 authored by George G. Davis's avatar George G. Davis Committed by Russell King
Browse files

[ARM] 2959/1: Add test for invalid LDRD/STRD Rd cases in ARM alignment handler 



Patch from George G. Davis

Add test for invalid LDRD/STRD Rd cases in ARM alignment handler
and restore SWP printk KERN_ERR.

Signed-off-by: default avatarSteve Longerbeam <slongerbeam@mvista.com>
Signed-off-by: default avatarGeorge G. Davis <gdavis@mvista.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 79d13b62

arch/arm/mm/alignment.c

+10 −1
Original line number Diff line number Diff line
@@ -330,6 +330,9 @@ do_alignment_ldrdstrd(unsigned long addr, unsigned long instr, 
{

	unsigned int rd = RD_BITS(instr);



	if (((rd & 1) == 1) || (rd == 14))

		goto bad;



	ai_dword += 1;



	if (user_mode(regs))
@@ -361,7 +364,8 @@ do_alignment_ldrdstrd(unsigned long addr, unsigned long instr, 
	}



	return TYPE_LDST;



 bad:

	return TYPE_ERROR;

 fault:

	return TYPE_FAULT;

}
@@ -663,6 +667,8 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
		else if ((instr & 0x001000f0) == 0x000000d0 || /* LDRD */

			 (instr & 0x001000f0) == 0x000000f0)   /* STRD */

			handler = do_alignment_ldrdstrd;

		else if ((instr & 0x01f00ff0) == 0x01000090) /* SWP */

			goto swp;

		else

			goto bad;

		break;
@@ -733,6 +739,9 @@ do_alignment(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
	do_bad_area(current, current->mm, addr, fsr, regs);

	return 0;



 swp:

	printk(KERN_ERR "Alignment trap: not handling swp instruction\n");



 bad:

	/*

	 * Oops, we didn't handle the instruction.