linux-kernel - [tip:x86/urgent] x86/mm/ASLR: Avoid PAGE

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-570e1aa84c376ff39809442f09c7606ddf62cfd1@git.kernel.org>
Date:	Fri, 20 Feb 2015 02:31:37 -0800
From:	tip-bot for Jiri Kosina <tipbot@...or.com>
To:	linux-tip-commits@...r.kernel.org
Cc:	jkosina@...e.cz, keescook@...omium.org,
	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...nel.org,
	tglx@...utronix.de, hpa@...ux.intel.com, bp@...e.de,
	fengguang.wu@...el.com
Subject: [tip:x86/urgent] x86/mm/ASLR:
  Avoid PAGE_SIZE redefinition for UML subarch

Commit-ID:  570e1aa84c376ff39809442f09c7606ddf62cfd1
Gitweb:     http://git.kernel.org/tip/570e1aa84c376ff39809442f09c7606ddf62cfd1
Author:     Jiri Kosina <jkosina@...e.cz>
AuthorDate: Fri, 20 Feb 2015 10:18:59 +0100
Committer:  Ingo Molnar <mingo@...nel.org>
CommitDate: Fri, 20 Feb 2015 10:55:32 +0100

x86/mm/ASLR: Avoid PAGE_SIZE redefinition for UML subarch

Commit f47233c2d34 ("x86/mm/ASLR: Propagate base load address
calculation") causes PAGE_SIZE redefinition warnings for UML
subarch  builds. This is caused by added includes that were
leftovers from previous  patch versions are are not actually
needed (especially page_types.h  inlcude in module.c). Drop
those stray includes.

Reported-by: kbuild test robot <fengguang.wu@...el.com>
Signed-off-by: Jiri Kosina <jkosina@...e.cz>
Cc: Borislav Petkov <bp@...e.de>
Cc: H. Peter Anvin <hpa@...ux.intel.com>
Cc: Kees Cook <keescook@...omium.org>
Link: http://lkml.kernel.org/r/alpine.LNX.2.00.1502201017240.28769@pobox.suse.cz
Signed-off-by: Ingo Molnar <mingo@...nel.org>
---
 arch/x86/include/asm/page_types.h | 1 -
 arch/x86/kernel/module.c          | 1 -
 2 files changed, 2 deletions(-)

diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
index 3d43ce3..95e11f7 100644
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
@@ -3,7 +3,6 @@
 
 #include <linux/const.h>
 #include <linux/types.h>
-#include <asm/bootparam.h>
 
 /* PAGE_SHIFT determines the page size */
 #define PAGE_SHIFT	12
diff --git a/arch/x86/kernel/module.c b/arch/x86/kernel/module.c
index c3c59a3..ef00116 100644
--- a/arch/x86/kernel/module.c
+++ b/arch/x86/kernel/module.c
@@ -32,7 +32,6 @@
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
-#include <asm/page_types.h>
 
 #if 0
 #define DEBUGP(fmt, ...)				\
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/