[kernel] r11449 - in dists/sid/linux-2.6/debian: . patches/bugfix/all patches/series

[Maximilian Attems]

Author: maks
Date: Sat May 24 18:36:19 2008
New Revision: 11449

Log:
types.h: don't expose struct ustat to userspace.

add upstream merged patch.


Added:
   dists/sid/linux-2.6/debian/patches/bugfix/all/0001-types.h-don-t-expose-struct-ustat-to-userspace.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/4

Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sat May 24 18:36:19 2008
@@ -44,6 +44,7 @@
   * Update userspace merged HZ alpha fixed version.
   * Backport netfilter: Move linux/types.h inclusions outside of #ifdef
     __KERNEL__. (closes: #479899)
+  * types.h: don't expose struct ustat to userspace. (closes: #429064)
  
   [ Bastian Blank ]
   * Fix ABI changes from: ipvs: fix oops in backup for fwmark conn templates

Added: dists/sid/linux-2.6/debian/patches/bugfix/all/0001-types.h-don-t-expose-struct-ustat-to-userspace.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/all/0001-types.h-don-t-expose-struct-ustat-to-userspace.patch	Sat May 24 18:36:19 2008
@@ -0,0 +1,49 @@
+From 6c7c6afbb8c0e60d32a563cae7c6889211e9d9d8 Mon Sep 17 00:00:00 2001
+From: maximilian attems <max at stro.at>
+Date: Fri, 23 May 2008 13:04:29 -0700
+Subject: [PATCH] types.h: don't expose struct ustat to userspace
+
+<linux/types.h> can't be used together with <sys/ustat.h> because they
+both define struct ustat:
+
+    $ cat test.c
+    #include <sys/ustat.h>
+    #include <linux/types.h>
+    $ gcc -c test.c
+    In file included from test.c:2:
+    /usr/include/linux/types.h:165: error: redefinition of 'struct ustat'
+
+has been reported a while ago to debian, but seems to have been
+lost in cat fighting: http://bugs.debian.org/429064
+
+Signed-off-by: maximilian attems <max at stro.at>
+Cc: <stable at kernel.org>
+Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
+---
+ include/linux/types.h |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/linux/types.h b/include/linux/types.h
+index 9dc2346..d4a9ce6 100644
+--- a/include/linux/types.h
++++ b/include/linux/types.h
+@@ -197,8 +197,6 @@ typedef u64 resource_size_t;
+ typedef u32 resource_size_t;
+ #endif
+ 
+-#endif	/* __KERNEL__ */
+-
+ struct ustat {
+ 	__kernel_daddr_t	f_tfree;
+ 	__kernel_ino_t		f_tinode;
+@@ -206,4 +204,6 @@ struct ustat {
+ 	char			f_fpack[6];
+ };
+ 
++#endif	/* __KERNEL__ */
++
+ #endif /* _LINUX_TYPES_H */
+-- 
+1.5.5.1
+

Modified: dists/sid/linux-2.6/debian/patches/series/4
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/4	(original)
+++ dists/sid/linux-2.6/debian/patches/series/4	Sat May 24 18:36:19 2008
@@ -3,3 +3,4 @@
 + bugfix/all/unbreak-HZ-userspace-2.patch
 + bugfix/all/stable/2.6.25.4-abi-1.patch
 + bugfix/all/0001-netfilter-Move-linux-types.h-inclusions-outside-of.patch
++ bugfix/all/0001-types.h-don-t-expose-struct-ustat-to-userspace.patch