The patch titled
binfmt_elf: fix checks for bad address
has been added to the -mm tree. Its filename is
binfmt_elf-fix-checks-for-bad-address.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: binfmt_elf: fix checks for bad address
From: Chuck Ebbert <76306.1226@xxxxxxxxxxxxxx>
Fix check for bad address; use macro instead of open-coding two checks.
Taken from RHEL4 kernel update.
Signed-off-by: Chuck Ebbert <76306.1226@xxxxxxxxxxxxxx>
Cc: Ernie Petrides <petrides@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
fs/binfmt_elf.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff -puN fs/binfmt_elf.c~binfmt_elf-fix-checks-for-bad-address fs/binfmt_elf.c
--- a/fs/binfmt_elf.c~binfmt_elf-fix-checks-for-bad-address
+++ a/fs/binfmt_elf.c
@@ -84,7 +84,7 @@ static struct linux_binfmt elf_format =
.min_coredump = ELF_EXEC_PAGESIZE
};
-#define BAD_ADDR(x) ((unsigned long)(x) > TASK_SIZE)
+#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE)
static int set_brk(unsigned long start, unsigned long end)
{
@@ -394,7 +394,7 @@ static unsigned long load_elf_interp(str
* <= p_memsize so it's only necessary to check p_memsz.
*/
k = load_addr + eppnt->p_vaddr;
- if (k > TASK_SIZE ||
+ if (BAD_ADDR(k) ||
eppnt->p_filesz > eppnt->p_memsz ||
eppnt->p_memsz > TASK_SIZE ||
TASK_SIZE - eppnt->p_memsz < k) {
@@ -887,7 +887,7 @@ static int load_elf_binary(struct linux_
* allowed task size. Note that p_filesz must always be
* <= p_memsz so it is only necessary to check p_memsz.
*/
- if (k > TASK_SIZE || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
+ if (BAD_ADDR(k) || elf_ppnt->p_filesz > elf_ppnt->p_memsz ||
elf_ppnt->p_memsz > TASK_SIZE ||
TASK_SIZE - elf_ppnt->p_memsz < k) {
/* set_brk can never work. Avoid overflows. */
_
Patches currently in -mm which might be from 76306.1226@xxxxxxxxxxxxxx are
i386-let-usermode-execute-the-enter.patch
i386-fix-get_segment_eip-with-vm86.patch
i386-dont-try-kprobes-for-v8086-mode.patch
i386-print-stack-size-in-oops-messages.patch
i386-use-c-code-for-current_thread_info.patch
i386-extra-checks-in-show_registers.patch
binfmt_elf-fix-checks-for-bad-address.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
