Commit 053a858e authored by Michael Ellerman's avatar Michael Ellerman Committed by Paul Mackerras

powerpc: Make create_branch() return errors if the branch target is too large

If you pass a target value to create_branch() which is more than 32MB - 4,
or - 32MB away from the branch site, then it's impossible to create an
immediate branch.  The current code doesn't check, which will lead to us
creating a branch to somewhere else - which is bad.

For code that cares to check we return 0, which is easy to check for, and
for code that doesn't at least we'll be creating an illegal instruction,
rather than a branch to some random address.
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Acked-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent e7a57273
...@@ -26,12 +26,18 @@ unsigned int create_branch(const unsigned int *addr, ...@@ -26,12 +26,18 @@ unsigned int create_branch(const unsigned int *addr,
unsigned long target, int flags) unsigned long target, int flags)
{ {
unsigned int instruction; unsigned int instruction;
long offset;
offset = target;
if (! (flags & BRANCH_ABSOLUTE)) if (! (flags & BRANCH_ABSOLUTE))
target = target - (unsigned long)addr; offset = offset - (unsigned long)addr;
/* Check we can represent the target in the instruction format */
if (offset < -0x2000000 || offset > 0x1fffffc || offset & 0x3)
return 0;
/* Mask out the flags and target, so they don't step on each other. */ /* Mask out the flags and target, so they don't step on each other. */
instruction = 0x48000000 | (flags & 0x3) | (target & 0x03FFFFFC); instruction = 0x48000000 | (flags & 0x3) | (offset & 0x03FFFFFC);
return instruction; return instruction;
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment