summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-04-13 14:19:26 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-04-13 14:19:26 -0700
commitcb0fc55dea8b498c286976bc4833481f6078c061 (patch)
tree38b59bd0bdb62d67f53ecdce067d4f577c48be40 /arch
parent5142ef1cbda9a48ff87e9b944096767252204c6e (diff)
parent940db9e654dab0cb68b5b9ec52f627945807aac9 (diff)
downloadkernel-cb0fc55dea8b498c286976bc4833481f6078c061.tar.gz
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32
Pull avr32 fix from Hans-Christian Egtvedt. * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32: avr32: fix integer overflow in ELF_ET_DYN_BASE
Diffstat (limited to 'arch')
-rw-r--r--arch/avr32/include/asm/elf.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/avr32/include/asm/elf.h b/arch/avr32/include/asm/elf.h
index d232888b99d5..0388ece75b02 100644
--- a/arch/avr32/include/asm/elf.h
+++ b/arch/avr32/include/asm/elf.h
@@ -84,7 +84,7 @@ typedef struct user_fpu_struct elf_fpregset_t;
the loader. We need to make sure that it is out of the way of the program
that it will "exec", and that there is sufficient room for the brk. */
-#define ELF_ET_DYN_BASE (2 * TASK_SIZE / 3)
+#define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
/* This yields a mask that user programs can use to figure out what