- headers_check-dont-expose-pfn-stuff-to-userspace-in.patch removed from -mm tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



The patch titled

     headers_check: don't expose PFN stuff to userspace in <asm-i386/setup.h>

has been removed from the -mm tree.  Its filename is

     headers_check-dont-expose-pfn-stuff-to-userspace-in.patch

This patch was dropped because it was merged into mainline or a subsystem tree

------------------------------------------------------
Subject: headers_check: don't expose PFN stuff to userspace in <asm-i386/setup.h>
From: David Woodhouse <dwmw2@xxxxxxxxxxxxx>

The header file <linux/pfn.h> doesn't exist in userspace and probably
shouldn't -- but it's used unconditionally in <asm-i386/setup.h>.  Protect it
with #ifdef __KERNEL__ and move setup.h from $(header-y) to $(unifdef-y) in
Kbuild accordingly.

Signed-off-by: David Woodhouse <dwmw2@xxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---

 include/asm-i386/Kbuild  |    4 ++--
 include/asm-i386/setup.h |    2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff -puN include/asm-i386/Kbuild~headers_check-dont-expose-pfn-stuff-to-userspace-in include/asm-i386/Kbuild
--- a/include/asm-i386/Kbuild~headers_check-dont-expose-pfn-stuff-to-userspace-in
+++ a/include/asm-i386/Kbuild
@@ -1,5 +1,5 @@
 include include/asm-generic/Kbuild.asm
 
-header-y += boot.h debugreg.h ldt.h setup.h ucontext.h
+header-y += boot.h debugreg.h ldt.h ucontext.h
 
-unifdef-y += mtrr.h vm86.h
+unifdef-y += mtrr.h setup.h vm86.h
diff -puN include/asm-i386/setup.h~headers_check-dont-expose-pfn-stuff-to-userspace-in include/asm-i386/setup.h
--- a/include/asm-i386/setup.h~headers_check-dont-expose-pfn-stuff-to-userspace-in
+++ a/include/asm-i386/setup.h
@@ -6,6 +6,7 @@
 #ifndef _i386_SETUP_H
 #define _i386_SETUP_H
 
+#ifdef __KERNEL__
 #include <linux/pfn.h>
 
 /*
@@ -13,6 +14,7 @@
  */
 #define MAXMEM_PFN	PFN_DOWN(MAXMEM)
 #define MAX_NONPAE_PFN	(1 << 20)
+#endif
 
 #define PARAM_SIZE 4096
 #define COMMAND_LINE_SIZE 256
_

Patches currently in -mm which might be from dwmw2@xxxxxxxxxxxxx are

origin.patch
fix-make-headers_check-on-biarch-architectures-for.patch
fix-make-headers_check-on-s390-for-2618.patch
fix-make-headers_check-on-ia64-for-2618.patch
fix-make-headers_check-on-x86_64-for-2618.patch
fix-make-headers_check-on-i386-for-2618.patch
fix-make-headers_check-for-alpha-in-2618.patch
headers_check-use-a-different-default-directory.patch
mtd-nand-oob-buffer-offset-fixups.patch
jffs2-summary-fix-a-summary-collecting-bug.patch
arm-make-headers_check.patch
git-gfs2.patch
git-mtd.patch
mtd-maps-ixp4xx-partition-parsing.patch
fix-the-unlock-addr-lookup-bug-in-mtd-jedec-probe.patch
mtd-printk-format-warning.patch
fs-jffs2-jffs2_fs_ih-removal-of-old-code.patch
drivers-mtd-nand-au1550ndc-removal-of-old-code.patch
fix-make-headers_check-for-parisc-in-2618.patch
pci-quirks-update.patch
avr32-mtd-static-memory-controller-driver-try-2.patch
avr32-mtd-unlock-flash-if-necessary-try-2.patch
avr32-mtd-at49bv6416-platform-device-for-atstk1000.patch
split-i386-and-x86_64-ptraceh.patch
split-i386-and-x86_64-ptraceh-fix.patch
make-uml-use-ptrace-abih.patch
fs-conversions-from-kmallocmemset-to-kzcalloc.patch
add-config_headers_check-option-to-automatically-run-make-headers_check.patch
pci-mtd-switch-to-pci_get_device-and-do-ref-counting.patch
the-scheduled-removal-of-some-oss-drivers-fix-fix.patch
debug-shared-irqs.patch
debug-shared-irqs-kconfig-fix.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

[Index of Archives]     [Kernel Newbies FAQ]     [Kernel Archive]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [Bugtraq]     [Photo]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]

  Powered by Linux