[kernel] r6076 - in dists/sid/linux-2.6/debian: . patches patches/series

[maximilian attems]

Author: maks-guest
Date: Sun Mar  5 21:26:34 2006
New Revision: 6076

Added:
   dists/sid/linux-2.6/debian/patches/2.6.15.6.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/8
Log:
add 2.6.15.6


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Sun Mar  5 21:26:34 2006
@@ -42,9 +42,13 @@
     - Normal user can panic NFS client with direct I/O (CVE-2006-0555)
   * Deactivate merged duplicates: s390-klibc-buildfix.patch,
     powerpc-relocate_code.patch.
+  * Add stable Release 2.6.15.6:
+    - Don't reset rskq_defer_accept in reqsk_queue_alloc
+    - fs/nfs/direct.c compile fix
+    - mempolicy.c compile fix, make sure BITS_PER_BYTE is defined
+    - [IA64] die_if_kernel() can return (CVE-2006-0742)
 
-
- -- maximilian attems <maks at sternwelten.at>  Thu,  2 Mar 2006 14:01:03 +0100
+ -- maximilian attems <maks at sternwelten.at>  Sun,  5 Mar 2006 22:20:26 +0100
 
 linux-2.6 (2.6.15-7) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/2.6.15.6.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/2.6.15.6.patch	Sun Mar  5 21:26:34 2006
@@ -0,0 +1,67 @@
+diff --git a/arch/ia64/kernel/unaligned.c b/arch/ia64/kernel/unaligned.c
+index 43b45b6..f2bc971 100644
+--- a/arch/ia64/kernel/unaligned.c
++++ b/arch/ia64/kernel/unaligned.c
+@@ -24,7 +24,7 @@
+ #include <asm/uaccess.h>
+ #include <asm/unaligned.h>
+ 
+-extern void die_if_kernel(char *str, struct pt_regs *regs, long err) __attribute__ ((noreturn));
++extern void die_if_kernel(char *str, struct pt_regs *regs, long err);
+ 
+ #undef DEBUG_UNALIGNED_TRAP
+ 
+diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
+index 3ebb06e..96c104b 100644
+--- a/fs/nfs/direct.c
++++ b/fs/nfs/direct.c
+@@ -57,6 +57,7 @@
+ #define NFSDBG_FACILITY		NFSDBG_VFS
+ #define MAX_DIRECTIO_SIZE	(4096UL << PAGE_SHIFT)
+ 
++static void nfs_free_user_pages(struct page **pages, int npages, int do_dirty);
+ static kmem_cache_t *nfs_direct_cachep;
+ 
+ /*
+@@ -106,12 +107,16 @@ nfs_get_user_pages(int rw, unsigned long
+ 		result = get_user_pages(current, current->mm, user_addr,
+ 					page_count, (rw == READ), 0,
+ 					*pages, NULL);
++		up_read(&current->mm->mmap_sem);
++		/*
++		 * If we got fewer pages than expected from get_user_pages(),
++		 * the user buffer runs off the end of a mapping; return EFAULT.
++		 */
+ 		if (result >= 0 && result < page_count) {
+ 			nfs_free_user_pages(*pages, result, 0);
+ 			*pages = NULL;
+ 			result = -EFAULT;
+ 		}
+-		up_read(&current->mm->mmap_sem);
+ 	}
+ 	return result;
+ }
+diff --git a/include/linux/types.h b/include/linux/types.h
+index 21b9ce8..f5a4572 100644
+--- a/include/linux/types.h
++++ b/include/linux/types.h
+@@ -8,6 +8,7 @@
+ 	(((bits)+BITS_PER_LONG-1)/BITS_PER_LONG)
+ #define DECLARE_BITMAP(name,bits) \
+ 	unsigned long name[BITS_TO_LONGS(bits)]
++#define BITS_PER_BYTE 8
+ #endif
+ 
+ #include <linux/posix_types.h>
+diff --git a/net/core/request_sock.c b/net/core/request_sock.c
+index b8203de..98f0fc9 100644
+--- a/net/core/request_sock.c
++++ b/net/core/request_sock.c
+@@ -52,7 +52,6 @@ int reqsk_queue_alloc(struct request_soc
+ 	get_random_bytes(&lopt->hash_rnd, sizeof(lopt->hash_rnd));
+ 	rwlock_init(&queue->syn_wait_lock);
+ 	queue->rskq_accept_head = queue->rskq_accept_head = NULL;
+-	queue->rskq_defer_accept = 0;
+ 	lopt->nr_table_entries = nr_table_entries;
+ 
+ 	write_lock_bh(&queue->syn_wait_lock);

Modified: dists/sid/linux-2.6/debian/patches/series/8
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/8	(original)
+++ dists/sid/linux-2.6/debian/patches/series/8	Sun Mar  5 21:26:34 2006
@@ -1,3 +1,4 @@
 - s390-klibc-buildfix.patch
 - powerpc-relocate_code.patch
 + 2.6.15.5.patch
++ 2.6.15.6.patch