Hi all! As part of the VAMOS[0] research project at the University of Erlangen we are looking at multiple integrity errors in linux' configuration system. The following patch removes a unnecessary conditional. Inside a block making sure CONFIG_MMU isn't set the option is checked again and based on that some parts are (not) included. As the outer check already makes sure CONFIG_MMU isn't set here both checks are unnecessary so this patch removes them. Please keep me informed of this patch getting confirmed / merged so we can keep track of it. Regards Christoph Egger [0] http://vamos1.informatik.uni-erlangen.de/ ---- >From 641fdd413e19208abfd764e061c8bbddeb24d574 Mon Sep 17 00:00:00 2001 From: Christoph Egger <siccegge@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> Date: Mon, 26 Apr 2010 15:32:53 +0200 Subject: [PATCH] Remove redundant check for CONFIG_MMU The checks for CONFIG_MMU at this location is duplicated as all the code is located inside a #ifndef CONFIG_MMU block. So the first Conditional Block will always be included while the second will never. Signed-off-by: Christoph Egger <siccegge@xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx> --- fs/binfmt_elf_fdpic.c | 7 ------- 1 files changed, 0 insertions(+), 7 deletions(-) diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c index 7ab23e0..2c5f9a0 100644 --- a/fs/binfmt_elf_fdpic.c +++ b/fs/binfmt_elf_fdpic.c @@ -1005,15 +1005,8 @@ static int elf_fdpic_map_file_constdisp_on_uclinux( } } else if (!mm->start_data) { mm->start_data = seg->addr; -#ifndef CONFIG_MMU mm->end_data = seg->addr + phdr->p_memsz; -#endif } - -#ifdef CONFIG_MMU - if (seg->addr + phdr->p_memsz > mm->end_data) - mm->end_data = seg->addr + phdr->p_memsz; -#endif } seg++; -- 1.6.3.3 -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
