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

Commit 40258ee9 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Fix up uninitialized variable use caught by gcc 4.4. 



In the unaligned kernel exception fixup case the printk() was ordered
before the copy_from_user(), resulting in a nonsensical instruction
value. This fixes up the ordering properly.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 23c4c821

arch/sh/kernel/traps_32.c

+6 −6
Original line number Original line Diff line number Diff line
@@ -678,12 +678,6 @@ asmlinkage void do_address_error(struct pt_regs *regs, 
	} else {

	} else {

		se_sys += 1;

		se_sys += 1;





		if (se_kernmode_warn)

			printk(KERN_NOTICE "Unaligned kernel access "

			       "on behalf of \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",

			       current->comm, current->pid, (void *)regs->pc,

			       instruction);



		if (regs->pc & 1)

		if (regs->pc & 1)

			die("unaligned program counter", regs, error_code);

			die("unaligned program counter", regs, error_code);
@@ -697,6 +691,12 @@ asmlinkage void do_address_error(struct pt_regs *regs, 
			die("insn faulting in do_address_error", regs, 0);

			die("insn faulting in do_address_error", regs, 0);

		}

		}





		if (se_kernmode_warn)

			printk(KERN_NOTICE "Unaligned kernel access "

			       "on behalf of \"%s\" pid=%d pc=0x%p ins=0x%04hx\n",

			       current->comm, current->pid, (void *)regs->pc,

			       instruction);



		handle_unaligned_access(instruction, regs,

		handle_unaligned_access(instruction, regs,

					&user_mem_access, 0);

					&user_mem_access, 0);

		set_fs(oldfs);

		set_fs(oldfs);