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_64 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_64 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 32fe96794990e5e5a2cb3b2b7bcb0c49e61d4c9b Mon Sep 17 00:00:00 2001
From: Christoph Egger <[email protected]>
Date: Mon, 26 Apr 2010 15:54:55 +0200
Subject: [PATCH] Remove redundant check for CONFIG_64
THis is a check for CONFIG_64 inside a block that is only active when
CONFIG_64 is set. So the check is actually useless and potentially
irritation.
Signed-off-by: Christoph Egger <[email protected]>
---
arch/s390/kernel/vdso.c | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index 6bc9c19..6b83870 100644
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -102,11 +102,7 @@ static void vdso_init_per_cpu_data(int cpu, struct vdso_per_cpu_data *vpcd)
/*
* Allocate/free per cpu vdso data.
*/
-#ifdef CONFIG_64BIT
#define SEGMENT_ORDER 2
-#else
-#define SEGMENT_ORDER 1
-#endif
int vdso_alloc_per_cpu(int cpu, struct _lowcore *lowcore)
{
--
1.6.3.3
On Mon, Apr 26, 2010 at 04:06:18PM +0200, Christoph Egger wrote:
> THis is a check for CONFIG_64 inside a block that is only active when
> CONFIG_64 is set. So the check is actually useless and potentially
> irritation.
>
> --- a/arch/s390/kernel/vdso.c
> +++ b/arch/s390/kernel/vdso.c
> @@ -102,11 +102,7 @@ static void vdso_init_per_cpu_data(int cpu, struct vdso_per_cpu_data *vpcd)
> /*
> * Allocate/free per cpu vdso data.
> */
> -#ifdef CONFIG_64BIT
> #define SEGMENT_ORDER 2
> -#else
> -#define SEGMENT_ORDER 1
> -#endif
Applied, thanks.