# ChangeLog for sys-kernel/gentoo-sources
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.216 2005/11/25 12:35:05 dsd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/ChangeLog,v 1.217 2005/11/26 17:02:28 dsd Exp $
+
+ 26 Nov 2005; Daniel Drake <dsd@gentoo.org>
+ -files/gentoo-sources-2.4.28.77181.patch,
+ -files/gentoo-sources-2.4.28.arpFix.patch,
+ -files/gentoo-sources-2.4.28.brk-locked.patch,
+ -files/gentoo-sources-2.4.77094.patch,
+ -files/gentoo-sources-2.4.77666.patch,
+ -files/gentoo-sources-2.4.78362.patch,
+ -files/gentoo-sources-2.4.78363.patch,
+ -files/gentoo-sources-2.4.81195.patch,
+ -files/gentoo-sources-2.4.81295.patch,
+ -files/gentoo-sources-2.4.82201.patch,
+ -files/gentoo-sources-2.4.CAN-2004-1016.patch,
+ -files/gentoo-sources-2.4.CAN-2004-1137.patch,
+ -files/gentoo-sources-2.4.PaX-84167.patch,
+ -files/gentoo-sources-2.4.binfmt_a.out.patch,
+ -files/gentoo-sources-2.4.cmdlineLeak.patch,
+ -files/gentoo-sources-2.4.vma.patch, -gentoo-sources-2.4.28-r9.ebuild,
+ -gentoo-sources-2.6.13-r3.ebuild:
+ Remove old versions
*gentoo-sources-2.6.14-r3 (25 Nov 2005)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
-MD5 5d60854e776fa8f77ce2ad304ff951b9 gentoo-sources-2.4.28-r9.ebuild 1409
-MD5 4e6dac28dac10504ffbdd16e04162376 gentoo-sources-2.6.13-r3.ebuild 1224
MD5 4fe2361f0783bd3be8d329b874b10150 gentoo-sources-2.4.31-r1.ebuild 666
MD5 5e8d15c677287cdd6d28b103ceb8a446 gentoo-sources-2.6.14-r2.ebuild 1215
MD5 ddedd86bf4e0c17341b2e58ba14dfc65 gentoo-sources-2.6.14.ebuild 1213
MD5 08cec32eca745c0b191933166dbef23d gentoo-sources-2.6.12-r10.ebuild 1230
MD5 6945faa2e5b09e5f2e93f95a99a370cc gentoo-sources-2.6.14-r1.ebuild 1209
MD5 2d2150ca2b1b3db3d469a5a2356161fb gentoo-sources-2.6.9-r9.ebuild 1625
-MD5 22e516c9c208863751b020efe196c6ec ChangeLog 52604
+MD5 8a02f8a1bdea5ee0f3e88f5f51e642f0 ChangeLog 53444
MD5 29804901afcfbc72fd34a15215274676 gentoo-sources-2.6.14-r3.ebuild 1216
MD5 410c3afeb274354a7ce68257edc18012 metadata.xml 283
MD5 578def525c4bfdc7e7a52db7e3c0ce21 gentoo-sources-2.6.12-r9.ebuild 1230
-MD5 29e531cdd3f2effce5e31a1f2afb5b5d files/gentoo-sources-2.4.28.brk-locked.patch 8912
MD5 a0bbc4339013a85527d8e66627e579e4 files/digest-gentoo-sources-2.6.14 221
-MD5 8c35751caf824a9dacb02e80d6189b2e files/gentoo-sources-2.4.CAN-2004-1137.patch 1764
-MD5 6aa8f7a7c2d55734389b53d3bcf78570 files/gentoo-sources-2.4.CAN-2004-1016.patch 2835
-MD5 4120a11b06ed6042ad4cb29de19b011c files/gentoo-sources-2.4.81295.patch 8526
-MD5 b1f723b1661a3fcbe79e921ddfe40584 files/gentoo-sources-2.4.PaX-84167.patch 1202
MD5 0f93b46ae17cbd0fc9b4d1cf5d704296 files/gentoo-sources-2.4.81106.patch 2243
-MD5 0c2bca31a62192779bf6129b3b23238b files/gentoo-sources-2.4.28.arpFix.patch 1021
-MD5 6ed89b8ac0b47a4c25d3a616ef9245cc files/gentoo-sources-2.4.vma.patch 11369
-MD5 6faf43bc1de5775e68cde4e6d2c2a76b files/gentoo-sources-2.4.82201.patch 480
-MD5 b6cd2468a246169a6e2f969c44e3f341 files/gentoo-sources-2.4.78362.patch 10372
MD5 757ee1239c3f14645ccea3640d551e11 files/gentoo-sources-2.4.CAN-2004-1056.patch 11249
-MD5 1efe4024e443e60db5fd9b21b22fabd2 files/gentoo-sources-2.4.77666.patch 1724
-MD5 3f8d2e3d28369e95a59804dbf9a9132b files/gentoo-sources-2.4.81195.patch 11448
-MD5 1d78b90e495e432432e095ee47bbc2fc files/gentoo-sources-2.4.77094.patch 452
-MD5 792fa9165e5ae65d46ee206c7f7a4fc9 files/gentoo-sources-2.4.78363.patch 788
-MD5 179bd3656f72932f69b0f860d23483cd files/digest-gentoo-sources-2.4.28-r9 226
MD5 0361b484cca5df06a9d3a66e1d18d733 files/digest-gentoo-sources-2.4.31-r1 144
MD5 45ce2dce01589bf396381a9d118bdaa6 files/digest-gentoo-sources-2.6.12-r10 224
-MD5 d1ccc2047be533c992f67270a150a210 files/gentoo-sources-2.4.cmdlineLeak.patch 388
-MD5 b9a94233e1457787352e5f85e3e3582d files/gentoo-sources-2.4.binfmt_a.out.patch 2009
MD5 fb66bd5497f574c00a8ba4d5f798dc00 files/Changelog-2.4.bz2 6590
MD5 99f953806141558102cef23e64948908 files/digest-gentoo-sources-2.6.9-r9 221
-MD5 b09e0ad41a8658a3e1309e5ab3ad652b files/gentoo-sources-2.4.28.77181.patch 295
MD5 9c17d336cb966ab5940ab7310eca21ab files/digest-gentoo-sources-2.6.12-r9 224
-MD5 45b3d45d2c8aa2357866223b77b53896 files/digest-gentoo-sources-2.6.13-r3 222
MD5 1a6d9b8b740a728909cc5dad107f2e55 files/digest-gentoo-sources-2.6.13-r5 222
MD5 b7f0d5d5345c0e3b58b4130a76533b0e files/digest-gentoo-sources-2.6.14-r1 221
MD5 bc78fdc3574ce30767b5dc41782696ac files/digest-gentoo-sources-2.6.14-r2 222
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (GNU/Linux)
-iD8DBQFDhwUbTOXg++0VvJQRAlW7AKDN6ZqnNE/8glBD8vwmHzpf1GZjUwCeKGZx
-wosVVyXZ1u57/0VbER2RuJU=
-=WSkK
+iD8DBQFDiJUyTOXg++0VvJQRAgILAKCzSERP+kicZVebFvARlbArx0ZmawCfZZ44
+xexWAI3jmE7qUfZn8fQkCjg=
+=+Eat
-----END PGP SIGNATURE-----
+++ /dev/null
-MD5 ac7735000d185bc7778c08288760a8a3 linux-2.4.28.tar.bz2 31064046
-MD5 c115734967dea547bc09a266a75b04e4 gentoo-sources-2.4.28-r4.tar.bz2 999208
-MD5 5ea3dab67a9193d767327cf3b8ee8c27 ck-sources-2.4.28-CAN-2004-0814.patch 144998
+++ /dev/null
-MD5 560f5fadf59f172973e67939868a4cae linux-2.6.13.tar.bz2 38372729
-MD5 38dc526e50d1fc91a5023893bf1d2774 genpatches-2.6.13-5.base.tar.bz2 43442
-MD5 6990d09338fca8031824e7f2205d0b87 genpatches-2.6.13-5.extras.tar.bz2 160140
+++ /dev/null
---- 1.4/net/decnet/dn_neigh.c 2005-02-17 10:05:41 -08:00
-+++ 1.5/net/decnet/dn_neigh.c 2005-02-17 10:05:41 -08:00
-@@ -26,6 +26,7 @@
-
- #include <linux/config.h>
- #include <linux/net.h>
-+#include <linux/module.h>
- #include <linux/socket.h>
- #include <linux/if_arp.h>
- #include <linux/if_ether.h>
+++ /dev/null
-*** linux-2.4.28-gentoo-r5/net/core/neighbour.c Mon Jan 17 13:16:22 2005
---- linux-2.4.28-gentoo-r5/net/core/neighbour.c Fri Jan 21 15:33:56 2005
-***************
-*** 427,437 ****
-
- n->confirmed = jiffies - (n->parms->base_reachable_time<<1);
-
-- hash_val = tbl->hash(pkey, dev) & tbl->hash_mask;
--
- write_lock_bh(&tbl->lock);
- if (atomic_read(&tbl->entries) > (tbl->hash_mask + 1))
- neigh_hash_grow(tbl, (tbl->hash_mask + 1) << 1);
- for (n1 = tbl->hash_buckets[hash_val]; n1; n1 = n1->next) {
- if (dev == n1->dev &&
- memcmp(n1->primary_key, pkey, key_len) == 0) {
---- 427,438 ----
-
- n->confirmed = jiffies - (n->parms->base_reachable_time<<1);
-
- write_lock_bh(&tbl->lock);
- if (atomic_read(&tbl->entries) > (tbl->hash_mask + 1))
- neigh_hash_grow(tbl, (tbl->hash_mask + 1) << 1);
-+
-+ hash_val = tbl->hash(pkey, dev) & tbl->hash_mask;
-+
- for (n1 = tbl->hash_buckets[hash_val]; n1; n1 = n1->next) {
- if (dev == n1->dev &&
- memcmp(n1->primary_key, pkey, key_len) == 0) {
+++ /dev/null
-diff -ur linux-2.4.28-gentoo-r4/arch/mips/kernel/irixelf.c linux-2.4.28-gentoo-r5/arch/mips/kernel/irixelf.c
---- linux-2.4.28-gentoo-r4/arch/mips/kernel/irixelf.c 2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/arch/mips/kernel/irixelf.c 2005-01-07 20:20:32.000000000 +0000
-@@ -130,7 +130,7 @@
- end = PAGE_ALIGN(end);
- if (end <= start)
- return;
-- do_brk(start, end - start);
-+ do_brk_locked(start, end - start);
- }
-
-
-@@ -379,7 +379,7 @@
-
- /* Map the last of the bss segment */
- if (last_bss > len) {
-- do_brk(len, (last_bss - len));
-+ do_brk_locked(len, (last_bss - len));
- }
- kfree(elf_phdata);
-
-@@ -567,7 +567,7 @@
- unsigned long v;
- struct prda *pp;
-
-- v = do_brk (PRDA_ADDRESS, PAGE_SIZE);
-+ v = do_brk_locked (PRDA_ADDRESS, PAGE_SIZE);
-
- if (v < 0)
- return;
-@@ -859,7 +859,7 @@
- len = (elf_phdata->p_filesz + elf_phdata->p_vaddr+ 0xfff) & 0xfffff000;
- bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
- if (bss > len)
-- do_brk(len, bss-len);
-+ do_brk_locked(len, bss-len);
- kfree(elf_phdata);
- return 0;
- }
-diff -ur linux-2.4.28-gentoo-r4/arch/sparc64/kernel/binfmt_aout32.c linux-2.4.28-gentoo-r5/arch/sparc64/kernel/binfmt_aout32.c
---- linux-2.4.28-gentoo-r4/arch/sparc64/kernel/binfmt_aout32.c 2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/arch/sparc64/kernel/binfmt_aout32.c 2005-01-07 20:20:32.000000000 +0000
-@@ -49,7 +49,7 @@
- end = PAGE_ALIGN(end);
- if (end <= start)
- return;
-- do_brk(start, end - start);
-+ do_brk_locked(start, end - start);
- }
-
- /*
-@@ -246,10 +246,10 @@
- if (N_MAGIC(ex) == NMAGIC) {
- loff_t pos = fd_offset;
- /* Fuck me plenty... */
-- error = do_brk(N_TXTADDR(ex), ex.a_text);
-+ error = do_brk_locked(N_TXTADDR(ex), ex.a_text);
- bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
- ex.a_text, &pos);
-- error = do_brk(N_DATADDR(ex), ex.a_data);
-+ error = do_brk_locked(N_DATADDR(ex), ex.a_data);
- bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
- ex.a_data, &pos);
- goto beyond_if;
-@@ -257,7 +257,7 @@
-
- if (N_MAGIC(ex) == OMAGIC) {
- loff_t pos = fd_offset;
-- do_brk(N_TXTADDR(ex) & PAGE_MASK,
-+ do_brk_locked(N_TXTADDR(ex) & PAGE_MASK,
- ex.a_text+ex.a_data + PAGE_SIZE - 1);
- bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
- ex.a_text+ex.a_data, &pos);
-@@ -272,7 +272,7 @@
-
- if (!bprm->file->f_op->mmap) {
- loff_t pos = fd_offset;
-- do_brk(0, ex.a_text+ex.a_data);
-+ do_brk_locked(0, ex.a_text+ex.a_data);
- bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
- ex.a_text+ex.a_data, &pos);
- goto beyond_if;
-@@ -388,7 +388,7 @@
- len = PAGE_ALIGN(ex.a_text + ex.a_data);
- bss = ex.a_text + ex.a_data + ex.a_bss;
- if (bss > len) {
-- error = do_brk(start_addr + len, bss - len);
-+ error = do_brk_locked(start_addr + len, bss - len);
- retval = error;
- if (error != start_addr + len)
- goto out;
-diff -ur linux-2.4.28-gentoo-r4/fs/binfmt_aout.c linux-2.4.28-gentoo-r5/fs/binfmt_aout.c
---- linux-2.4.28-gentoo-r4/fs/binfmt_aout.c 2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/fs/binfmt_aout.c 2005-01-07 20:20:32.000000000 +0000
-@@ -46,7 +46,7 @@
- start = PAGE_ALIGN(start);
- end = PAGE_ALIGN(end);
- if (end > start) {
-- unsigned long addr = do_brk(start, end - start);
-+ unsigned long addr = do_brk_locked(start, end - start);
- if (BAD_ADDR(addr))
- return addr;
- }
-@@ -341,10 +341,10 @@
- loff_t pos = fd_offset;
- /* Fuck me plenty... */
- /* <AOL></AOL> */
-- error = do_brk(N_TXTADDR(ex), ex.a_text);
-+ error = do_brk_locked(N_TXTADDR(ex), ex.a_text);
- bprm->file->f_op->read(bprm->file, (char *) N_TXTADDR(ex),
- ex.a_text, &pos);
-- error = do_brk(N_DATADDR(ex), ex.a_data);
-+ error = do_brk_locked(N_DATADDR(ex), ex.a_data);
- bprm->file->f_op->read(bprm->file, (char *) N_DATADDR(ex),
- ex.a_data, &pos);
- goto beyond_if;
-@@ -365,7 +365,7 @@
- map_size = ex.a_text+ex.a_data;
- #endif
-
-- error = do_brk(text_addr & PAGE_MASK, map_size);
-+ error = do_brk_locked(text_addr & PAGE_MASK, map_size);
- if (error != (text_addr & PAGE_MASK)) {
- send_sig(SIGKILL, current, 0);
- return error;
-@@ -399,7 +399,7 @@
-
- if (!bprm->file->f_op->mmap||((fd_offset & ~PAGE_MASK) != 0)) {
- loff_t pos = fd_offset;
-- do_brk(N_TXTADDR(ex), ex.a_text+ex.a_data);
-+ do_brk_locked(N_TXTADDR(ex), ex.a_text+ex.a_data);
- bprm->file->f_op->read(bprm->file,(char *)N_TXTADDR(ex),
- ex.a_text+ex.a_data, &pos);
- flush_icache_range((unsigned long) N_TXTADDR(ex),
-@@ -500,7 +500,7 @@
- error_time = jiffies;
- }
-
-- do_brk(start_addr, ex.a_text + ex.a_data + ex.a_bss);
-+ do_brk_locked(start_addr, ex.a_text + ex.a_data + ex.a_bss);
-
- file->f_op->read(file, (char *)start_addr,
- ex.a_text + ex.a_data, &pos);
-@@ -524,7 +524,7 @@
- len = PAGE_ALIGN(ex.a_text + ex.a_data);
- bss = ex.a_text + ex.a_data + ex.a_bss;
- if (bss > len) {
-- error = do_brk(start_addr + len, bss - len);
-+ error = do_brk_locked(start_addr + len, bss - len);
- retval = error;
- if (error != start_addr + len)
- goto out;
-diff -ur linux-2.4.28-gentoo-r4/fs/binfmt_elf.c linux-2.4.28-gentoo-r5/fs/binfmt_elf.c
---- linux-2.4.28-gentoo-r4/fs/binfmt_elf.c 2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/fs/binfmt_elf.c 2005-01-07 20:20:46.000000000 +0000
-@@ -88,6 +88,7 @@ static void set_brk(unsigned long start,
- end = ELF_PAGEALIGN(end);
- if (end <= start)
- return;
-+ down_write(¤t->mm->mmap_sem);
- do_brk(start, end - start);
-
- #ifdef CONFIG_GRKERNSEC_PAX_RANDEXEC
-@@ -95,6 +96,7 @@ static void set_brk(unsigned long start,
- __do_mmap_pgoff(NULL, ELF_PAGEALIGN(start + current->mm->delta_exec), 0UL, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_FIXED | MAP_MIRROR, start);
- #endif
-
-+ up_write(¤t->mm->mmap_sem);
- }
-
-
-@@ -295,7 +297,9 @@ static unsigned long load_elf_interp(str
- */
- if (interp_elf_ex->e_phentsize != sizeof(struct elf_phdr))
- goto out;
-- if (interp_elf_ex->e_phnum > 65536U / sizeof(struct elf_phdr))
-+
-+ if (interp_elf_ex->e_phnum < 1 ||
-+ interp_elf_ex->e_phnum > 65536U / sizeof(struct elf_phdr))
- goto out;
-
- /* Now read in all of the header information */
-@@ -370,7 +370,7 @@
-
- /* Map the last of the bss segment */
- if (last_bss > elf_bss)
-- do_brk(elf_bss, last_bss - elf_bss);
-+ do_brk_locked(elf_bss, last_bss - elf_bss);
-
- *interp_load_addr = load_addr;
- error = ((unsigned long) interp_elf_ex->e_entry) + load_addr;
-@@ -407,7 +407,7 @@
- goto out;
- }
-
-- do_brk(0, text_data);
-+ do_brk_locked(0, text_data);
- if (!interpreter->f_op || !interpreter->f_op->read)
- goto out;
- if (interpreter->f_op->read(interpreter, addr, text_data, &offset) < 0)
-@@ -415,7 +415,7 @@
- flush_icache_range((unsigned long)addr,
- (unsigned long)addr + text_data);
-
-- do_brk(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
-+ do_brk_locked(ELF_PAGESTART(text_data + ELF_MIN_ALIGN - 1),
- interp_ex->a_bss);
- elf_entry = interp_ex->a_entry;
-
-@@ -1271,7 +1271,7 @@
- len = ELF_PAGESTART(elf_phdata->p_filesz + elf_phdata->p_vaddr + ELF_MIN_ALIGN - 1);
- bss = elf_phdata->p_memsz + elf_phdata->p_vaddr;
- if (bss > len)
-- do_brk(len, bss - len);
-+ do_brk_locked(len, bss - len);
- error = 0;
-
- out_free_ph:
-diff -ur linux-2.4.28-gentoo-r4/include/linux/mm.h linux-2.4.28-gentoo-r5/include/linux/mm.h
---- linux-2.4.28-gentoo-r4/include/linux/mm.h 2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/include/linux/mm.h 2005-01-07 20:20:32.000000000 +0000
-@@ -601,6 +601,7 @@
- extern int do_munmap(struct mm_struct *, unsigned long, size_t);
-
- extern unsigned long do_brk(unsigned long, unsigned long);
-+extern unsigned long do_brk_locked(unsigned long, unsigned long);
-
- static inline void __vma_unlink(struct mm_struct * mm, struct vm_area_struct * vma, struct vm_area_struct * prev)
- {
-diff -ur linux-2.4.28-gentoo-r4/kernel/ksyms.c linux-2.4.28-gentoo-r5/kernel/ksyms.c
---- linux-2.4.28-gentoo-r4/kernel/ksyms.c 2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/kernel/ksyms.c 2005-01-07 20:20:32.000000000 +0000
-@@ -90,6 +90,7 @@
- EXPORT_SYMBOL(__do_mmap_pgoff);
- EXPORT_SYMBOL(do_munmap);
- EXPORT_SYMBOL(do_brk);
-+EXPORT_SYMBOL(do_brk_locked);
- EXPORT_SYMBOL(exit_mm);
- EXPORT_SYMBOL(exit_files);
- EXPORT_SYMBOL(exit_fs);
-diff -ur linux-2.4.28-gentoo-r4/mm/mmap.c linux-2.4.28-gentoo-r5/mm/mmap.c
---- linux-2.4.28-gentoo-r4/mm/mmap.c 2005-01-07 20:33:12.000000000 +0000
-+++ linux-2.4.28-gentoo-r5/mm/mmap.c 2005-01-07 20:20:32.000000000 +0000
-@@ -1401,6 +1401,21 @@
- return addr;
- }
-
-+/* locking version of do_brk. */
-+unsigned long do_brk_locked(unsigned long addr, unsigned long len)
-+{
-+ unsigned long ret;
-+
-+ down_write(¤t->mm->mmap_sem);
-+ ret = do_brk(addr, len);
-+ up_write(¤t->mm->mmap_sem);
-+
-+ return ret;
-+}
-+
-+
-+
-+
- /* Build the RB tree corresponding to the VMA list. */
- void build_mmap_rb(struct mm_struct * mm)
- {
+++ /dev/null
-diff -ur linux-2.4.28/drivers/char/random.c linux-2.4.28.plasmaroo/drivers/char/random.c
---- linux-2.4.28/drivers/char/random.c 2004-11-17 11:54:21.000000000 +0000
-+++ linux-2.4.28.plasmaroo/drivers/char/random.c 2005-01-08 02:54:49.198635736 +0000
-@@ -1787,7 +1787,7 @@
- void *oldval, size_t *oldlenp,
- void *newval, size_t newlen, void **context)
- {
-- int len;
-+ size_t len;
-
- sysctl_poolsize = random_state->poolinfo.POOLBYTES;
-
+++ /dev/null
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/12 09:14:50-02:00 marcelo.tosatti@cyclades.com
-# [PATCH] Fix expand_stack() SMP race
-#
-# Description: Fix expand_stack() SMP race
-#
-# Two threads sharing the same VMA can race in expand_stack, resulting in incorrect VMA
-# size accounting and possibly a "uncovered-by-VMA" pte leak.
-#
-# Fix is to check if the stack has already been expanded after acquiring a lock which
-# guarantees exclusivity (page_table_lock in v2.4 and vma_anon lock in v2.6).
-#
-# include/linux/mm.h
-# 2005/01/07 14:51:21-02:00 marcelo.tosatti@cyclades.com +10 -3
-# Fix expand_stack() SMP race
-#
-diff -Nru a/include/linux/mm.h b/include/linux/mm.h
---- a/include/linux/mm.h 2005-01-13 04:59:30 -08:00
-+++ b/include/linux/mm.h 2005-01-13 04:59:30 -08:00
-@@ -648,12 +648,19 @@
- unsigned long grow;
-
- /*
-- * vma->vm_start/vm_end cannot change under us because the caller is required
-- * to hold the mmap_sem in write mode. We need to get the spinlock only
-- * before relocating the vma range ourself.
-+ * vma->vm_start/vm_end cannot change under us because the caller
-+ * is required to hold the mmap_sem in read mode. We need the
-+ * page_table_lock lock to serialize against concurrent expand_stacks.
- */
- address &= PAGE_MASK;
- spin_lock(&vma->vm_mm->page_table_lock);
-+
-+ /* already expanded while we were spinning? */
-+ if (vma->vm_start <= address) {
-+ spin_unlock(&vma->vm_mm->page_table_lock);
-+ return 0;
-+ }
-+
- grow = (vma->vm_start - address) >> PAGE_SHIFT;
- if (vma->vm_end - address > current->rlim[RLIMIT_STACK].rlim_cur ||
- ((vma->vm_mm->total_vm + grow) << PAGE_SHIFT) > current->rlim[RLIMIT_AS].rlim_cur) {
+++ /dev/null
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/08 13:33:08-08:00 davem@nuts.davemloft.net
-# [NET]: CMSG compat code needs signedness fixes too.
-#
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# arch/ia64/ia32/sys_ia32.c
-# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -4
-# [NET]: CMSG compat code needs signedness fixes too.
-#
-# arch/mips64/kernel/linux32.c
-# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +7 -5
-# [NET]: CMSG compat code needs signedness fixes too.
-#
-# arch/parisc/kernel/sys_parisc32.c
-# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5
-# [NET]: CMSG compat code needs signedness fixes too.
-#
-# arch/ppc64/kernel/sys_ppc32.c
-# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5
-# [NET]: CMSG compat code needs signedness fixes too.
-#
-# arch/s390x/kernel/linux32.c
-# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5
-# [NET]: CMSG compat code needs signedness fixes too.
-#
-# arch/sparc64/kernel/sys_sparc32.c
-# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +6 -5
-# [NET]: CMSG compat code needs signedness fixes too.
-#
-# arch/x86_64/ia32/socket32.c
-# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +2 -5
-# [NET]: CMSG compat code needs signedness fixes too.
-#
-# include/asm-x86_64/socket32.h
-# 2004/12/08 13:32:46-08:00 davem@nuts.davemloft.net +5 -0
-# [NET]: CMSG compat code needs signedness fixes too.
-#
-# ChangeSet
-# 2004/12/15 09:25:31-02:00 marcelo@logos.cnet
-# [PATCH] Make sure VC resizing fits in s16
-#
-# Noted by George Guninski
-#
-# drivers/char/console.c
-# 2004/12/15 10:58:17-02:00 marcelo@logos.cnet +6 -0
-# Import patch vc-patch
-#
-diff -Nru a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
---- a/arch/ia64/ia32/sys_ia32.c 2005-02-15 11:50:28 -08:00
-+++ b/arch/ia64/ia32/sys_ia32.c 2005-02-15 11:50:28 -08:00
-@@ -1369,6 +1369,11 @@
- #define __CMSG32_FIRSTHDR(ctl,len) \
- ((len) >= sizeof(struct cmsghdr32) ? (struct cmsghdr32 *)(ctl) : (struct cmsghdr32 *)NULL)
- #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen)
-+#define CMSG32_OK(ucmlen, ucmsg, mhdr) \
-+ ((ucmlen) >= sizeof(struct cmsghdr) && \
-+ (ucmlen) <= (unsigned long) \
-+ ((mhdr)->msg_controllen - \
-+ ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
-
- static inline struct cmsghdr32 *
- __cmsg32_nxthdr (void *ctl, __kernel_size_t size, struct cmsghdr32 *cmsg, int cmsg_len)
-@@ -1429,10 +1434,7 @@
- return -EFAULT;
-
- /* Catch bogons. */
-- if (CMSG32_ALIGN(ucmlen) < CMSG32_ALIGN(sizeof(struct cmsghdr32)))
-- return -EINVAL;
-- if ((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control) + ucmlen)
-- > kmsg->msg_controllen)
-+ if (!CMSG32_OK(ucmlen, ucmsg, kmsg))
- return -EINVAL;
-
- tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) +
-diff -Nru a/arch/mips64/kernel/linux32.c b/arch/mips64/kernel/linux32.c
---- a/arch/mips64/kernel/linux32.c 2005-02-15 11:50:28 -08:00
-+++ b/arch/mips64/kernel/linux32.c 2005-02-15 11:50:28 -08:00
-@@ -2483,6 +2483,12 @@
- (struct cmsghdr32 *)(ctl) : \
- (struct cmsghdr32 *)NULL)
- #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen)
-+#define CMSG32_OK(ucmlen, ucmsg, mhdr) \
-+ ((ucmlen) >= sizeof(struct cmsghdr) && \
-+ (ucmlen) <= (unsigned long) \
-+ ((mhdr)->msg_controllen - \
-+ ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
-+
-
- __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size,
- struct cmsghdr32 *__cmsg, int __cmsg_len)
-@@ -2623,11 +2629,7 @@
- return -EFAULT;
-
- /* Catch bogons. */
-- if(CMSG32_ALIGN(ucmlen) <
-- CMSG32_ALIGN(sizeof(struct cmsghdr32)))
-- return -ENOBUFS;
-- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control)
-- + ucmlen) > kmsg->msg_controllen)
-+ if (!CMSG32_OK(ucmlen, ucmsg, kmsg))
- return -EINVAL;
-
- tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) +
-diff -Nru a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
---- a/arch/parisc/kernel/sys_parisc32.c 2005-02-15 11:50:28 -08:00
-+++ b/arch/parisc/kernel/sys_parisc32.c 2005-02-15 11:50:28 -08:00
-@@ -1814,6 +1814,11 @@
- (struct cmsghdr32 *)(ctl) : \
- (struct cmsghdr32 *)NULL)
- #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen)
-+#define CMSG32_OK(ucmlen, ucmsg, mhdr) \
-+ ((ucmlen) >= sizeof(struct cmsghdr) && \
-+ (ucmlen) <= (unsigned long) \
-+ ((mhdr)->msg_controllen - \
-+ ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
-
- __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size,
- struct cmsghdr32 *__cmsg, int __cmsg_len)
-@@ -1940,11 +1945,7 @@
- return -EFAULT;
-
- /* Catch bogons. */
-- if(CMSG32_ALIGN(ucmlen) <
-- CMSG32_ALIGN(sizeof(struct cmsghdr32)))
-- return -EINVAL;
-- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control)
-- + ucmlen) > kmsg->msg_controllen)
-+ if (!CMSG32_OK(ucmlen, ucmsg, kmsg))
- return -EINVAL;
-
- tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) +
-diff -Nru a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c
---- a/arch/ppc64/kernel/sys_ppc32.c 2005-02-15 11:50:28 -08:00
-+++ b/arch/ppc64/kernel/sys_ppc32.c 2005-02-15 11:50:28 -08:00
-@@ -3273,6 +3273,11 @@
- (struct cmsghdr32 *)(ctl) : \
- (struct cmsghdr32 *)NULL)
- #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen)
-+#define CMSG32_OK(ucmlen, ucmsg, mhdr) \
-+ ((ucmlen) >= sizeof(struct cmsghdr) && \
-+ (ucmlen) <= (unsigned long) \
-+ ((mhdr)->msg_controllen - \
-+ ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
-
- struct msghdr32
- {
-@@ -3448,11 +3453,7 @@
- return -EFAULT;
-
- /* Catch bogons. */
-- if(CMSG32_ALIGN(ucmlen) <
-- CMSG32_ALIGN(sizeof(struct cmsghdr32)))
-- return -EINVAL;
-- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control)
-- + ucmlen) > kmsg->msg_controllen)
-+ if (!CMSG32_OK(ucmlen, ucmsg, kmsg))
- return -EINVAL;
-
- tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) +
-diff -Nru a/arch/s390x/kernel/linux32.c b/arch/s390x/kernel/linux32.c
---- a/arch/s390x/kernel/linux32.c 2005-02-15 11:50:28 -08:00
-+++ b/arch/s390x/kernel/linux32.c 2005-02-15 11:50:28 -08:00
-@@ -2306,6 +2306,11 @@
- (struct cmsghdr32 *)(ctl) : \
- (struct cmsghdr32 *)NULL)
- #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen)
-+#define CMSG32_OK(ucmlen, ucmsg, mhdr) \
-+ ((ucmlen) >= sizeof(struct cmsghdr) && \
-+ (ucmlen) <= (unsigned long) \
-+ ((mhdr)->msg_controllen - \
-+ ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
-
- __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size,
- struct cmsghdr32 *__cmsg, int __cmsg_len)
-@@ -2432,11 +2437,7 @@
- return -EFAULT;
-
- /* Catch bogons. */
-- if(CMSG32_ALIGN(ucmlen) <
-- CMSG32_ALIGN(sizeof(struct cmsghdr32)))
-- return -EINVAL;
-- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control)
-- + ucmlen) > kmsg->msg_controllen)
-+ if (!CMSG32_OK(ucmlen, ucmsg, kmsg))
- return -EINVAL;
-
- tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) +
-diff -Nru a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
---- a/arch/sparc64/kernel/sys_sparc32.c 2005-02-15 11:50:28 -08:00
-+++ b/arch/sparc64/kernel/sys_sparc32.c 2005-02-15 11:50:28 -08:00
-@@ -2354,6 +2354,11 @@
- (struct cmsghdr32 *)(ctl) : \
- (struct cmsghdr32 *)NULL)
- #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen)
-+#define CMSG32_OK(ucmlen, ucmsg, mhdr) \
-+ ((ucmlen) >= sizeof(struct cmsghdr) && \
-+ (ucmlen) <= (unsigned long) \
-+ ((mhdr)->msg_controllen - \
-+ ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
-
- __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size,
- struct cmsghdr32 *__cmsg, int __cmsg_len)
-@@ -2480,11 +2485,7 @@
- return -EFAULT;
-
- /* Catch bogons. */
-- if(CMSG32_ALIGN(ucmlen) <
-- CMSG32_ALIGN(sizeof(struct cmsghdr32)))
-- return -EINVAL;
-- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control)
-- + ucmlen) > kmsg->msg_controllen)
-+ if (!CMSG32_OK(ucmlen, ucmsg, kmsg))
- return -EINVAL;
-
- tmp = ((ucmlen - CMSG32_ALIGN(sizeof(*ucmsg))) +
-diff -Nru a/arch/x86_64/ia32/socket32.c b/arch/x86_64/ia32/socket32.c
---- a/arch/x86_64/ia32/socket32.c 2005-02-15 11:50:28 -08:00
-+++ b/arch/x86_64/ia32/socket32.c 2005-02-15 11:50:28 -08:00
-@@ -136,12 +136,9 @@
- return -EFAULT;
-
- /* Catch bogons. */
-- if(CMSG32_ALIGN(ucmlen) <
-- CMSG32_ALIGN(sizeof(struct cmsghdr32)))
-- return -EINVAL;
-- if((unsigned long)(((char *)ucmsg - (char *)kmsg->msg_control)
-- + ucmlen) > kmsg->msg_controllen)
-+ if (!CMSG32_OK(ucmlen, ucmsg, kmsg))
- return -EINVAL;
-+
- if (kmsg->msg_controllen > 65536)
- return -EINVAL;
-
-diff -Nru a/include/asm-x86_64/socket32.h b/include/asm-x86_64/socket32.h
---- a/include/asm-x86_64/socket32.h 2005-02-15 11:50:28 -08:00
-+++ b/include/asm-x86_64/socket32.h 2005-02-15 11:50:28 -08:00
-@@ -45,6 +45,11 @@
- (struct cmsghdr32 *)(ctl) : \
- (struct cmsghdr32 *)NULL)
- #define CMSG32_FIRSTHDR(msg) __CMSG32_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen)
-+#define CMSG32_OK(ucmlen, ucmsg, mhdr) \
-+ ((ucmlen) >= sizeof(struct cmsghdr) && \
-+ (ucmlen) <= (unsigned long) \
-+ ((mhdr)->msg_controllen - \
-+ ((char *)(ucmsg) - (char *)(mhdr)->msg_control)))
-
- __inline__ struct cmsghdr32 *__cmsg32_nxthdr(void *__ctl, __kernel_size_t __size,
- struct cmsghdr32 *__cmsg, int __cmsg_len)
-diff -Nru a/drivers/char/console.c b/drivers/char/console.c
---- a/drivers/char/console.c 2005-02-15 11:52:04 -08:00
-+++ b/drivers/char/console.c 2005-02-15 11:52:04 -08:00
-@@ -705,6 +705,9 @@
- return 0;
- }
-
-+#define VC_RESIZE_MAXCOL (32767)
-+#define VC_RESIZE_MAXROW (32767)
-+
- /*
- * Change # of rows and columns (0 means unchanged/the size of fg_console)
- * [this is to be used together with some user program
-@@ -716,6 +719,9 @@
- unsigned int cc, ll, ss, sr, todo = 0;
- unsigned int currcons = fg_console, i;
- unsigned short *newscreens[MAX_NR_CONSOLES];
-+
-+ if (cols > VC_RESIZE_MAXCOL || lines > VC_RESIZE_MAXROW)
-+ return -EINVAL;
-
- cc = (cols ? cols : video_num_columns);
- ll = (lines ? lines : video_num_lines);
+++ /dev/null
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2004/12/08 12:39:15-08:00 davem@nuts.davemloft.net
-# [IPV4]: Do not leak IP options.
-#
-# If the user makes ip_cmsg_send call ip_options_get
-# multiple times, we leak kmalloced IP options data.
-#
-# Noticed by Georgi Guninski.
-#
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/ipv4/ip_options.c
-# 2004/12/08 12:38:09-08:00 davem@nuts.davemloft.net +2 -0
-# [IPV4]: Do not leak IP options.
-#
-diff -Nru a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
---- a/net/ipv4/ip_options.c 2005-02-15 11:47:16 -08:00
-+++ b/net/ipv4/ip_options.c 2005-02-15 11:47:16 -08:00
-@@ -515,6 +515,8 @@
- kfree(opt);
- return -EINVAL;
- }
-+ if (*optp)
-+ kfree(*optp);
- *optp = opt;
- return 0;
- }
+++ /dev/null
-diff -Naru a/include/linux/netfilter_ipv4/ip_conntrack.h b/include/linux/netfilter_ipv4/ip_conntrack.h
---- a/include/linux/netfilter_ipv4/ip_conntrack.h 2005-03-29 07:28:22 -08:00
-+++ b/include/linux/netfilter_ipv4/ip_conntrack.h 2005-03-29 07:28:22 -08:00
-@@ -249,10 +249,9 @@
- /* Call me when a conntrack is destroyed. */
- extern void (*ip_conntrack_destroyed)(struct ip_conntrack *conntrack);
-
--extern int ip_ct_no_defrag;
- /* Returns new sk_buff, or NULL */
- struct sk_buff *
--ip_ct_gather_frags(struct sk_buff *skb);
-+ip_ct_gather_frags(struct sk_buff *skb, u_int32_t user);
-
- /* Delete all conntracks which match. */
- extern void
-diff -Naru a/include/net/ip.h b/include/net/ip.h
---- a/include/net/ip.h 2005-03-29 07:28:22 -08:00
-+++ b/include/net/ip.h 2005-03-29 07:28:22 -08:00
-@@ -227,9 +227,19 @@
- /*
- * Functions provided by ip_fragment.o
- */
--
--struct sk_buff *ip_defrag(struct sk_buff *skb);
--extern void ipfrag_flush(void);
-+
-+enum ip_defrag_users
-+{
-+ IP_DEFRAG_LOCAL_DELIVER,
-+ IP_DEFRAG_CALL_RA_CHAIN,
-+ IP_DEFRAG_CONNTRACK_IN,
-+ IP_DEFRAG_CONNTRACK_OUT,
-+ IP_DEFRAG_NAT_OUT,
-+ IP_DEFRAG_VS_OUT,
-+ IP_DEFRAG_VS_FWD
-+};
-+
-+struct sk_buff *ip_defrag(struct sk_buff *skb, u32 user);
- extern int ip_frag_nqueues;
- extern atomic_t ip_frag_mem;
-
-diff -Naru a/net/ipv4/ip_fragment.c b/net/ipv4/ip_fragment.c
---- a/net/ipv4/ip_fragment.c 2005-03-29 07:28:22 -08:00
-+++ b/net/ipv4/ip_fragment.c 2005-03-29 07:28:22 -08:00
-@@ -72,6 +72,7 @@
- struct ipq {
- struct ipq *next; /* linked list pointers */
- struct list_head lru_list; /* lru list member */
-+ u32 user;
- u32 saddr;
- u32 daddr;
- u16 id;
-@@ -242,13 +243,13 @@
- /* Memory limiting on fragments. Evictor trashes the oldest
- * fragment queue until we are back under the threshold.
- */
--static void __ip_evictor(int threshold)
-+static void ip_evictor(void)
- {
- struct ipq *qp;
- struct list_head *tmp;
- int work;
-
-- work = atomic_read(&ip_frag_mem) - threshold;
-+ work = atomic_read(&ip_frag_mem) - sysctl_ipfrag_low_thresh;
- if (work <= 0)
- return;
-
-@@ -273,11 +274,6 @@
- }
- }
-
--static inline void ip_evictor(void)
--{
-- __ip_evictor(sysctl_ipfrag_low_thresh);
--}
--
- /*
- * Oops, a fragment queue timed out. Kill it and send an ICMP reply.
- */
-@@ -324,7 +320,8 @@
- if(qp->id == qp_in->id &&
- qp->saddr == qp_in->saddr &&
- qp->daddr == qp_in->daddr &&
-- qp->protocol == qp_in->protocol) {
-+ qp->protocol == qp_in->protocol &&
-+ qp->user == qp_in->user) {
- atomic_inc(&qp->refcnt);
- write_unlock(&ipfrag_lock);
- qp_in->last_in |= COMPLETE;
-@@ -351,7 +348,7 @@
- }
-
- /* Add an entry to the 'ipq' queue for a newly received IP datagram. */
--static struct ipq *ip_frag_create(unsigned hash, struct iphdr *iph)
-+static struct ipq *ip_frag_create(unsigned hash, struct iphdr *iph, u32 user)
- {
- struct ipq *qp;
-
-@@ -363,6 +360,7 @@
- qp->id = iph->id;
- qp->saddr = iph->saddr;
- qp->daddr = iph->daddr;
-+ qp->user = user;
- qp->len = 0;
- qp->meat = 0;
- qp->fragments = NULL;
-@@ -385,7 +383,7 @@
- /* Find the correct entry in the "incomplete datagrams" queue for
- * this IP datagram, and create new one, if nothing is found.
- */
--static inline struct ipq *ip_find(struct iphdr *iph)
-+static inline struct ipq *ip_find(struct iphdr *iph, u32 user)
- {
- __u16 id = iph->id;
- __u32 saddr = iph->saddr;
-@@ -399,7 +397,8 @@
- if(qp->id == id &&
- qp->saddr == saddr &&
- qp->daddr == daddr &&
-- qp->protocol == protocol) {
-+ qp->protocol == protocol &&
-+ qp->user == user) {
- atomic_inc(&qp->refcnt);
- read_unlock(&ipfrag_lock);
- return qp;
-@@ -407,7 +406,7 @@
- }
- read_unlock(&ipfrag_lock);
-
-- return ip_frag_create(hash, iph);
-+ return ip_frag_create(hash, iph, user);
- }
-
- /* Add new segment to existing queue. */
-@@ -641,7 +640,7 @@
- }
-
- /* Process an incoming IP datagram fragment. */
--struct sk_buff *ip_defrag(struct sk_buff *skb)
-+struct sk_buff *ip_defrag(struct sk_buff *skb, u32 user)
- {
- struct iphdr *iph = skb->nh.iph;
- struct ipq *qp;
-@@ -656,7 +655,7 @@
- dev = skb->dev;
-
- /* Lookup (or create) queue header */
-- if ((qp = ip_find(iph)) != NULL) {
-+ if ((qp = ip_find(iph, user)) != NULL) {
- struct sk_buff *ret = NULL;
-
- spin_lock(&qp->lock);
-@@ -686,9 +685,4 @@
- ipfrag_secret_timer.function = ipfrag_secret_rebuild;
- ipfrag_secret_timer.expires = jiffies + sysctl_ipfrag_secret_interval;
- add_timer(&ipfrag_secret_timer);
--}
--
--void ipfrag_flush(void)
--{
-- __ip_evictor(0);
- }
-diff -Naru a/net/ipv4/ip_input.c b/net/ipv4/ip_input.c
---- a/net/ipv4/ip_input.c 2005-03-29 07:28:22 -08:00
-+++ b/net/ipv4/ip_input.c 2005-03-29 07:28:22 -08:00
-@@ -170,7 +170,7 @@
- && ((sk->bound_dev_if == 0)
- || (sk->bound_dev_if == skb->dev->ifindex))) {
- if (skb->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
-- skb = ip_defrag(skb);
-+ skb = ip_defrag(skb, IP_DEFRAG_CALL_RA_CHAIN);
- if (skb == NULL) {
- read_unlock(&ip_ra_lock);
- return 1;
-@@ -291,7 +291,7 @@
- */
-
- if (skb->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
-- skb = ip_defrag(skb);
-+ skb = ip_defrag(skb, IP_DEFRAG_LOCAL_DELIVER);
- if (!skb)
- return 0;
- }
-diff -Naru a/net/ipv4/ipvs/ip_vs_core.c b/net/ipv4/ipvs/ip_vs_core.c
---- a/net/ipv4/ipvs/ip_vs_core.c 2005-03-29 07:28:22 -08:00
-+++ b/net/ipv4/ipvs/ip_vs_core.c 2005-03-29 07:28:22 -08:00
-@@ -506,7 +506,7 @@
-
- /* reassemble IP fragments, but will it happen in ICMP packets?? */
- if (skb->nh.iph->frag_off & __constant_htons(IP_MF|IP_OFFSET)) {
-- skb = ip_defrag(skb);
-+ skb = ip_defrag(skb, IP_DEFRAG_VS_OUT);
- if (!skb)
- return NF_STOLEN;
- *skb_p = skb;
-@@ -658,7 +658,7 @@
-
- /* reassemble IP fragments */
- if (iph->frag_off & __constant_htons(IP_MF|IP_OFFSET)) {
-- skb = ip_defrag(skb);
-+ skb = ip_defrag(skb, IP_DEFRAG_VS_OUT);
- if (!skb)
- return NF_STOLEN;
- iph = skb->nh.iph;
-@@ -1164,7 +1164,7 @@
- return NF_ACCEPT;
-
- if (iph->frag_off & __constant_htons(IP_MF|IP_OFFSET)) {
-- skb = ip_defrag(skb);
-+ skb = ip_defrag(skb, IP_DEFRAG_VS_FWD);
- if (!skb)
- return NF_STOLEN;
- *skb_p = skb;
-diff -Naru a/net/ipv4/netfilter/ip_conntrack_core.c b/net/ipv4/netfilter/ip_conntrack_core.c
---- a/net/ipv4/netfilter/ip_conntrack_core.c 2005-03-29 07:28:22 -08:00
-+++ b/net/ipv4/netfilter/ip_conntrack_core.c 2005-03-29 07:28:22 -08:00
-@@ -834,7 +834,10 @@
-
- /* Gather fragments. */
- if ((*pskb)->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
-- *pskb = ip_ct_gather_frags(*pskb);
-+ *pskb = ip_ct_gather_frags(*pskb,
-+ hooknum == NF_IP_PRE_ROUTING ?
-+ IP_DEFRAG_CONNTRACK_IN :
-+ IP_DEFRAG_CONNTRACK_OUT);
- if (!*pskb)
- return NF_STOLEN;
- }
-@@ -1183,29 +1186,22 @@
- WRITE_UNLOCK(&ip_conntrack_lock);
- }
-
--int ip_ct_no_defrag;
--
- /* Returns new sk_buff, or NULL */
- struct sk_buff *
--ip_ct_gather_frags(struct sk_buff *skb)
-+ip_ct_gather_frags(struct sk_buff *skb, u_int32_t user)
- {
- struct sock *sk = skb->sk;
- #ifdef CONFIG_NETFILTER_DEBUG
- unsigned int olddebug = skb->nf_debug;
- #endif
-
-- if (unlikely(ip_ct_no_defrag)) {
-- kfree_skb(skb);
-- return NULL;
-- }
--
- if (sk) {
- sock_hold(sk);
- skb_orphan(skb);
- }
-
- local_bh_disable();
-- skb = ip_defrag(skb);
-+ skb = ip_defrag(skb, user);
- local_bh_enable();
-
- if (!skb) {
-diff -Naru a/net/ipv4/netfilter/ip_conntrack_standalone.c b/net/ipv4/netfilter/ip_conntrack_standalone.c
---- a/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-03-29 07:28:22 -08:00
-+++ b/net/ipv4/netfilter/ip_conntrack_standalone.c 2005-03-29 07:28:22 -08:00
-@@ -393,13 +393,6 @@
- cleanup_inandlocalops:
- nf_unregister_hook(&ip_conntrack_local_out_ops);
- cleanup_inops:
-- /* Frag queues may hold fragments with skb->dst == NULL */
-- ip_ct_no_defrag = 1;
-- local_bh_disable();
-- br_write_lock(BR_NETPROTO_LOCK);
-- br_write_unlock(BR_NETPROTO_LOCK);
-- ipfrag_flush();
-- local_bh_enable();
- nf_unregister_hook(&ip_conntrack_in_ops);
- cleanup_proc:
- proc_net_remove("ip_conntrack");
-diff -Naru a/net/ipv4/netfilter/ip_nat_standalone.c b/net/ipv4/netfilter/ip_nat_standalone.c
---- a/net/ipv4/netfilter/ip_nat_standalone.c 2005-03-29 07:28:22 -08:00
-+++ b/net/ipv4/netfilter/ip_nat_standalone.c 2005-03-29 07:28:22 -08:00
-@@ -201,7 +201,7 @@
- I'm starting to have nightmares about fragments. */
-
- if ((*pskb)->nh.iph->frag_off & htons(IP_MF|IP_OFFSET)) {
-- *pskb = ip_ct_gather_frags(*pskb);
-+ *pskb = ip_ct_gather_frags(*pskb, IP_DEFRAG_NAT_OUT);
-
- if (!*pskb)
- return NF_STOLEN;
-diff -Naru a/net/netsyms.c b/net/netsyms.c
---- a/net/netsyms.c 2005-03-29 07:28:22 -08:00
-+++ b/net/netsyms.c 2005-03-29 07:28:22 -08:00
-@@ -287,7 +287,6 @@
- EXPORT_SYMBOL(inetdev_by_index);
- EXPORT_SYMBOL(in_dev_finish_destroy);
- EXPORT_SYMBOL(ip_defrag);
--EXPORT_SYMBOL(ipfrag_flush);
-
- /* Route manipulation */
- EXPORT_SYMBOL(ip_rt_ioctl);
-# This is a BitKeeper generated diff -Nru style patch.
-#
-# ChangeSet
-# 2005/01/26 22:04:53-08:00 kaber@trash.net
-# [IPV4]: Keep fragment queues private to each user.
-#
-# Signed-off-by: Patrick McHardy <kaber@trash.net>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# include/linux/netfilter_ipv4/ip_conntrack.h
-# 2005/01/26 22:04:47-08:00 kaber@trash.net +1 -2
-# [IPV4]: Keep fragment queues private to each user.
-#
-# Signed-off-by: Patrick McHardy <kaber@trash.net>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# include/net/ip.h
-# 2005/01/26 22:04:47-08:00 kaber@trash.net +13 -3
-# [IPV4]: Keep fragment queues private to each user.
-#
-# Signed-off-by: Patrick McHardy <kaber@trash.net>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/ipv4/ip_fragment.c
-# 2005/01/26 22:04:47-08:00 kaber@trash.net +13 -19
-# [IPV4]: Keep fragment queues private to each user.
-#
-# Signed-off-by: Patrick McHardy <kaber@trash.net>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/ipv4/ip_input.c
-# 2005/01/26 22:04:47-08:00 kaber@trash.net +2 -2
-# [IPV4]: Keep fragment queues private to each user.
-#
-# Signed-off-by: Patrick McHardy <kaber@trash.net>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/ipv4/ipvs/ip_vs_core.c
-# 2005/01/26 22:04:47-08:00 kaber@trash.net +3 -3
-# [IPV4]: Keep fragment queues private to each user.
-#
-# Signed-off-by: Patrick McHardy <kaber@trash.net>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/ipv4/netfilter/ip_conntrack_core.c
-# 2005/01/26 22:04:47-08:00 kaber@trash.net +6 -10
-# [IPV4]: Keep fragment queues private to each user.
-#
-# Signed-off-by: Patrick McHardy <kaber@trash.net>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/ipv4/netfilter/ip_conntrack_standalone.c
-# 2005/01/26 22:04:48-08:00 kaber@trash.net +0 -7
-# [IPV4]: Keep fragment queues private to each user.
-#
-# Signed-off-by: Patrick McHardy <kaber@trash.net>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/ipv4/netfilter/ip_nat_standalone.c
-# 2005/01/26 22:04:48-08:00 kaber@trash.net +1 -1
-# [IPV4]: Keep fragment queues private to each user.
-#
-# Signed-off-by: Patrick McHardy <kaber@trash.net>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
-# net/netsyms.c
-# 2005/01/26 22:04:48-08:00 kaber@trash.net +0 -1
-# [IPV4]: Keep fragment queues private to each user.
-#
-# Signed-off-by: Patrick McHardy <kaber@trash.net>
-# Signed-off-by: David S. Miller <davem@davemloft.net>
-#
+++ /dev/null
-diff -Naru a/arch/mips64/kernel/linux32.c b/arch/mips64/kernel/linux32.c
---- a/arch/mips64/kernel/linux32.c 2005-04-15 13:46:27 -07:00
-+++ b/arch/mips64/kernel/linux32.c 2005-04-15 13:46:27 -07:00
-@@ -1088,11 +1088,9 @@
- i--;
- }
-
-- inode = file->f_dentry->d_inode;
- /* VERIFY_WRITE actually means a read, as we write to user space */
-- retval = locks_verify_area((type == VERIFY_WRITE
-- ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE),
-- inode, file, file->f_pos, tot_len);
-+ retval = rw_verify_area((type == VERIFY_WRITE ? READ : WRITE),
-+ file, &file->f_pos, tot_len);
- if (retval) {
- if (iov != iovstack)
- kfree(iov);
-diff -Naru a/arch/parisc/kernel/sys_parisc32.c b/arch/parisc/kernel/sys_parisc32.c
---- a/arch/parisc/kernel/sys_parisc32.c 2005-04-15 13:46:27 -07:00
-+++ b/arch/parisc/kernel/sys_parisc32.c 2005-04-15 13:46:27 -07:00
-@@ -1671,11 +1671,9 @@
- i--;
- }
-
-- inode = file->f_dentry->d_inode;
- /* VERIFY_WRITE actually means a read, as we write to user space */
-- retval = locks_verify_area((type == VERIFY_WRITE
-- ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE),
-- inode, file, file->f_pos, tot_len);
-+ retval = rw_verify_area((type == VERIFY_WRITE ? READ : WRITE),
-+ file, &file->f_pos, tot_len);
- if (retval) {
- if (iov != iovstack)
- kfree(iov);
-diff -Naru a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c
---- a/arch/ppc64/kernel/sys_ppc32.c 2005-04-15 13:46:27 -07:00
-+++ b/arch/ppc64/kernel/sys_ppc32.c 2005-04-15 13:46:27 -07:00
-@@ -183,11 +183,9 @@
- i--;
- }
-
-- inode = file->f_dentry->d_inode;
- /* VERIFY_WRITE actually means a read, as we write to user space */
-- retval = locks_verify_area((type == VERIFY_WRITE
-- ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE),
-- inode, file, file->f_pos, tot_len);
-+ retval = rw_verify_area((type == VERIFY_WRITE ? READ : WRITE),
-+ file, &file->f_pos, tot_len);
- if (retval) {
- if (iov != iovstack)
- kfree(iov);
-diff -Naru a/arch/s390x/kernel/linux32.c b/arch/s390x/kernel/linux32.c
---- a/arch/s390x/kernel/linux32.c 2005-04-15 13:46:27 -07:00
-+++ b/arch/s390x/kernel/linux32.c 2005-04-15 13:46:27 -07:00
-@@ -1108,7 +1108,6 @@
- unsigned long tot_len;
- struct iovec iovstack[UIO_FASTIOV];
- struct iovec *iov=iovstack, *ivp;
-- struct inode *inode;
- long retval, i;
- io_fn_t fn;
- iov_fn_t fnv;
-@@ -1145,11 +1144,9 @@
- i--;
- }
-
-- inode = file->f_dentry->d_inode;
- /* VERIFY_WRITE actually means a read, as we write to user space */
-- retval = locks_verify_area((type == VERIFY_WRITE
-- ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE),
-- inode, file, file->f_pos, tot_len);
-+ retval = rw_verify_area((type == VERIFY_WRITE ? READ : WRITE),
-+ file, &file->f_pos, tot_len);
- if (retval)
- goto out;
-
-diff -Naru a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
---- a/arch/sparc64/kernel/sys_sparc32.c 2005-04-15 13:46:27 -07:00
-+++ b/arch/sparc64/kernel/sys_sparc32.c 2005-04-15 13:46:27 -07:00
-@@ -1093,7 +1093,6 @@
- __kernel_ssize_t32 tot_len;
- struct iovec iovstack[UIO_FASTIOV];
- struct iovec *iov=iovstack, *ivp;
-- struct inode *inode;
- long retval, i;
- io_fn_t fn;
- iov_fn_t fnv;
-@@ -1140,11 +1139,9 @@
- i--;
- }
-
-- inode = file->f_dentry->d_inode;
- /* VERIFY_WRITE actually means a read, as we write to user space */
-- retval = locks_verify_area((type == VERIFY_WRITE
-- ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE),
-- inode, file, file->f_pos, tot_len);
-+ retval = rw_verify_area((type == VERIFY_WRITE ? READ : WRITE),
-+ file, &file->f_pos, tot_len);
- if (retval)
- goto out;
-
-diff -Naru a/fs/file_table.c b/fs/file_table.c
---- a/fs/file_table.c 2005-04-15 13:46:27 -07:00
-+++ b/fs/file_table.c 2005-04-15 13:46:27 -07:00
-@@ -46,6 +46,7 @@
- f->f_version = ++event;
- f->f_uid = current->fsuid;
- f->f_gid = current->fsgid;
-+ f->f_maxcount = INT_MAX;
- list_add(&f->f_list, &anon_list);
- file_list_unlock();
- return f;
-@@ -92,6 +92,8 @@
- filp->f_uid = current->fsuid;
- filp->f_gid = current->fsgid;
- filp->f_op = dentry->d_inode->i_fop;
-+ filp->f_maxcount = INT_MAX;
-+
- if (filp->f_op->open)
- return filp->f_op->open(dentry->d_inode, filp);
- else
-diff -Naru a/fs/read_write.c b/fs/read_write.c
---- a/fs/read_write.c 2005-04-15 13:46:27 -07:00
-+++ b/fs/read_write.c 2005-04-15 13:46:27 -07:00
-@@ -40,6 +40,28 @@
- return -EISDIR;
- }
-
-+int rw_verify_area(int read_write, struct file *file, loff_t *ppos, size_t count)
-+{
-+ struct inode *inode;
-+ loff_t pos;
-+
-+ if (unlikely(count > file->f_maxcount))
-+ goto Einval;
-+
-+ pos = *ppos;
-+
-+ if (unlikely((pos < 0) || (loff_t) (pos + count) < 0))
-+ goto Einval;
-+
-+ inode = file->f_dentry->d_inode;
-+ if (inode->i_flock && MANDATORY_LOCK(inode))
-+ return locks_mandatory_area(read_write == READ ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE, inode, file, *ppos, count);
-+ return 0;
-+
-+Einval:
-+ return -EINVAL;
-+}
-+
- loff_t generic_file_llseek(struct file *file, loff_t offset, int origin)
- {
- long long retval;
-@@ -168,8 +190,8 @@
- file = fget(fd);
- if (file) {
- if (file->f_mode & FMODE_READ) {
-- ret = locks_verify_area(FLOCK_VERIFY_READ, file->f_dentry->d_inode,
-- file, file->f_pos, count);
-+ ret = rw_verify_area(READ, file, &file->f_pos, count);
-+
- if (!ret) {
- ssize_t (*read)(struct file *, char *, size_t, loff_t *);
- ret = -EINVAL;
-@@ -193,9 +215,7 @@
- file = fget(fd);
- if (file) {
- if (file->f_mode & FMODE_WRITE) {
-- struct inode *inode = file->f_dentry->d_inode;
-- ret = locks_verify_area(FLOCK_VERIFY_WRITE, inode, file,
-- file->f_pos, count);
-+ ret = rw_verify_area(WRITE, file, &file->f_pos, count);
- if (!ret) {
- ssize_t (*write)(struct file *, const char *, size_t, loff_t *);
- ret = -EINVAL;
-@@ -224,7 +244,6 @@
- ssize_t ret, i;
- io_fn_t fn;
- iov_fn_t fnv;
-- struct inode *inode;
-
- /*
- * First get the "struct iovec" from user memory and
-@@ -275,12 +294,11 @@
- goto out;
- }
-
-- inode = file->f_dentry->d_inode;
- /* VERIFY_WRITE actually means a read, as we write to user space */
-- ret = locks_verify_area((type == VERIFY_WRITE
-- ? FLOCK_VERIFY_READ : FLOCK_VERIFY_WRITE),
-- inode, file, file->f_pos, tot_len);
-- if (ret) goto out;
-+ ret = rw_verify_area((type == VERIFY_WRITE ? READ : WRITE),
-+ file, &file->f_pos, tot_len);
-+ if (ret)
-+ goto out;
-
- fnv = (type == VERIFY_WRITE ? file->f_op->readv : file->f_op->writev);
- if (fnv) {
-@@ -383,8 +401,8 @@
- goto bad_file;
- if (!(file->f_mode & FMODE_READ))
- goto out;
-- ret = locks_verify_area(FLOCK_VERIFY_READ, file->f_dentry->d_inode,
-- file, pos, count);
-+ ret = rw_verify_area(READ, file, &pos, count);
-+
- if (ret)
- goto out;
- ret = -EINVAL;
-@@ -414,8 +432,8 @@
- goto bad_file;
- if (!(file->f_mode & FMODE_WRITE))
- goto out;
-- ret = locks_verify_area(FLOCK_VERIFY_WRITE, file->f_dentry->d_inode,
-- file, pos, count);
-+ ret = rw_verify_area(WRITE, file, &pos, count);
-+
- if (ret)
- goto out;
- ret = -EINVAL;
-diff -Naru a/include/linux/fs.h b/include/linux/fs.h
---- a/include/linux/fs.h 2005-04-15 13:46:27 -07:00
-+++ b/include/linux/fs.h 2005-04-15 13:46:27 -07:00
-@@ -576,6 +576,7 @@
- unsigned int f_uid, f_gid;
- int f_error;
-
-+ size_t f_maxcount;
- unsigned long f_version;
-
- /* needed for tty driver, and maybe others */
-@@ -1056,14 +1057,7 @@
- return 0;
- }
-
--static inline int locks_verify_area(int read_write, struct inode *inode,
-- struct file *filp, loff_t offset,
-- size_t count)
--{
-- if (inode->i_flock && MANDATORY_LOCK(inode))
-- return locks_mandatory_area(read_write, inode, filp, offset, count);
-- return 0;
--}
-+extern int rw_verify_area(int, struct file *, loff_t *, size_t);
-
- static inline int locks_verify_truncate(struct inode *inode,
- struct file *filp,
-diff -Naru a/mm/filemap.c b/mm/filemap.c
---- a/mm/filemap.c 2005-04-15 13:46:27 -07:00
-+++ b/mm/filemap.c 2005-04-15 13:46:27 -07:00
-@@ -1870,7 +1870,7 @@
- goto fput_in;
- if (!in_inode->i_mapping->a_ops->readpage)
- goto fput_in;
-- retval = locks_verify_area(FLOCK_VERIFY_READ, in_inode, in_file, in_file->f_pos, count);
-+ retval = rw_verify_area(READ, in_file, &in_file->f_pos, count);
- if (retval)
- goto fput_in;
-
-@@ -1887,7 +1887,7 @@
- if (!out_file->f_op || !out_file->f_op->write)
- goto fput_out;
- out_inode = out_file->f_dentry->d_inode;
-- retval = locks_verify_area(FLOCK_VERIFY_WRITE, out_inode, out_file, out_file->f_pos, count);
-+ retval = rw_verify_area(WRITE, out_file, &out_file->f_pos, count);
- if (retval)
- goto fput_out;
-
+++ /dev/null
-diff -urN linux-2.5/drivers/net/ppp_async.c test/drivers/net/ppp_async.c
---- linux-2.5/drivers/net/ppp_async.c 2005-01-21 16:02:12.000000000 +1100
-+++ test/drivers/net/ppp_async.c 2005-02-25 10:38:05.000000000 +1100
-@@ -1000,7 +1000,7 @@
- data += 4;
- dlen -= 4;
- /* data[0] is code, data[1] is length */
-- while (dlen >= 2 && dlen >= data[1]) {
-+ while (dlen >= 2 && dlen >= data[1] && data[1] >= 2) {
- switch (data[0]) {
- case LCP_MRU:
- val = (data[2] << 8) + data[3];
+++ /dev/null
-===== include/linux/socket.h 1.12 vs edited =====
---- 1.12/include/linux/socket.h 2004-09-09 06:40:01 +10:00
-+++ edited/include/linux/socket.h 2004-11-27 11:53:40 +11:00
-@@ -90,6 +90,10 @@
- (struct cmsghdr *)(ctl) : \
- (struct cmsghdr *)NULL)
- #define CMSG_FIRSTHDR(msg) __CMSG_FIRSTHDR((msg)->msg_control, (msg)->msg_controllen)
-+#define CMSG_OK(mhdr, cmsg) ((cmsg)->cmsg_len >= sizeof(struct cmsghdr) && \
-+ (cmsg)->cmsg_len <= (unsigned long) \
-+ ((mhdr)->msg_controllen - \
-+ ((char *)(cmsg) - (char *)(mhdr)->msg_control)))
-
- /*
- * This mess will go away with glibc
-===== net/core/scm.c 1.10 vs edited =====
---- 1.10/net/core/scm.c 2004-05-31 05:08:14 +10:00
-+++ edited/net/core/scm.c 2004-11-27 11:48:55 +11:00
-@@ -127,9 +127,7 @@
- for too short ancillary data object at all! Oops.
- OK, let's add it...
- */
-- if (cmsg->cmsg_len < sizeof(struct cmsghdr) ||
-- (unsigned long)(((char*)cmsg - (char*)msg->msg_control)
-- + cmsg->cmsg_len) > msg->msg_controllen)
-+ if (!CMSG_OK(msg, cmsg))
- goto error;
-
- if (cmsg->cmsg_level != SOL_SOCKET)
-===== net/ipv4/ip_sockglue.c 1.26 vs edited =====
---- 1.26/net/ipv4/ip_sockglue.c 2004-07-01 06:10:53 +10:00
-+++ edited/net/ipv4/ip_sockglue.c 2004-11-27 11:49:45 +11:00
-@@ -146,11 +146,8 @@
- struct cmsghdr *cmsg;
-
- for (cmsg = CMSG_FIRSTHDR(msg); cmsg; cmsg = CMSG_NXTHDR(msg, cmsg)) {
-- if (cmsg->cmsg_len < sizeof(struct cmsghdr) ||
-- (unsigned long)(((char*)cmsg - (char*)msg->msg_control)
-- + cmsg->cmsg_len) > msg->msg_controllen) {
-+ if (!CMSG_OK(msg, cmsg))
- return -EINVAL;
-- }
- if (cmsg->cmsg_level != SOL_IP)
- continue;
- switch (cmsg->cmsg_type) {
-===== net/ipv6/datagram.c 1.20 vs edited =====
---- 1.20/net/ipv6/datagram.c 2004-11-10 17:57:03 +11:00
-+++ edited/net/ipv6/datagram.c 2004-11-27 11:51:15 +11:00
-@@ -427,9 +427,7 @@
- int addr_type;
- struct net_device *dev = NULL;
-
-- if (cmsg->cmsg_len < sizeof(struct cmsghdr) ||
-- (unsigned long)(((char*)cmsg - (char*)msg->msg_control)
-- + cmsg->cmsg_len) > msg->msg_controllen) {
-+ if (!CMSG_OK(msg, cmsg)) {
- err = -EINVAL;
- goto exit_f;
- }
-===== net/sctp/socket.c 1.129 vs edited =====
---- 1.129/net/sctp/socket.c 2004-11-19 08:43:18 +11:00
-+++ edited/net/sctp/socket.c 2004-11-27 11:52:11 +11:00
-@@ -4098,12 +4098,8 @@
- for (cmsg = CMSG_FIRSTHDR(msg);
- cmsg != NULL;
- cmsg = CMSG_NXTHDR((struct msghdr*)msg, cmsg)) {
-- /* Check for minimum length. The SCM code has this check. */
-- if (cmsg->cmsg_len < sizeof(struct cmsghdr) ||
-- (unsigned long)(((char*)cmsg - (char*)msg->msg_control)
-- + cmsg->cmsg_len) > msg->msg_controllen) {
-+ if (!CMSG_OK(msg, cmsg))
- return -EINVAL;
-- }
-
- /* Should we parse this header or ignore? */
- if (cmsg->cmsg_level != IPPROTO_SCTP)
+++ /dev/null
---- linux-2.4.28-orig/net/ipv4/igmp.c 2004-08-08 01:26:06.000000000 +0200
-+++ linux-2.4.28/net/ipv4/igmp.c 2004-12-15 22:12:48.000000000 +0100
-@@ -1757,12 +1757,12 @@
- goto done;
- rv = !0;
- for (i=0; i<psl->sl_count; i++) {
-- rv = memcmp(&psl->sl_addr, &mreqs->imr_multiaddr,
-+ rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr,
- sizeof(__u32));
-- if (rv >= 0)
-+ if (rv == 0)
- break;
- }
-- if (!rv) /* source not found */
-+ if (rv) /* source not found */
- goto done;
-
- /* update the interface filter */
-@@ -1804,9 +1804,9 @@
- }
- rv = 1; /* > 0 for insert logic below if sl_count is 0 */
- for (i=0; i<psl->sl_count; i++) {
-- rv = memcmp(&psl->sl_addr, &mreqs->imr_multiaddr,
-+ rv = memcmp(&psl->sl_addr[i], &mreqs->imr_sourceaddr,
- sizeof(__u32));
-- if (rv >= 0)
-+ if (rv == 0)
- break;
- }
- if (rv == 0) /* address already there is an error */
---- linux-2.4.28-orig/net/ipv6/mcast.c 2004-11-17 12:54:22.000000000 +0100
-+++ linux-2.4.28/net/ipv6/mcast.c 2004-12-15 22:14:07.000000000 +0100
-@@ -386,12 +386,12 @@
- goto done;
- rv = !0;
- for (i=0; i<psl->sl_count; i++) {
-- rv = memcmp(&psl->sl_addr, group,
-+ rv = memcmp(&psl->sl_addr[i], source,
- sizeof(struct in6_addr));
-- if (rv >= 0)
-+ if (rv == 0)
- break;
- }
-- if (!rv) /* source not found */
-+ if (rv) /* source not found */
- goto done;
-
- /* update the interface filter */
-@@ -432,8 +432,8 @@
- }
- rv = 1; /* > 0 for insert logic below if sl_count is 0 */
- for (i=0; i<psl->sl_count; i++) {
-- rv = memcmp(&psl->sl_addr, group, sizeof(struct in6_addr));
-- if (rv >= 0)
-+ rv = memcmp(&psl->sl_addr[i], source, sizeof(struct in6_addr));
-+ if (rv == 0)
- break;
- }
- if (rv == 0) /* address already there is an error */
+++ /dev/null
---- mm/mmap.c.orig 2005-03-05 13:29:06.000000000 -0500
-+++ mm/mmap.c 2005-03-05 13:33:51.000000000 -0500
-@@ -1014,7 +1014,7 @@
- * we just free'd - but there's no telling how much before.
- */
- static void free_pgtables(struct mm_struct * mm, struct vm_area_struct *prev,
-- unsigned long start, unsigned long end)
-+ struct vm_area_struct *mpnt, unsigned long start, unsigned long end)
- {
- unsigned long first = start & PGDIR_MASK;
- unsigned long last = end + PGDIR_SIZE - 1;
-@@ -1046,6 +1046,14 @@
- break;
- }
- no_mmaps:
-+ while (mpnt && first < last) {
-+ if ((mpnt->vm_end > first) &&(last > mpnt->vm_start)) {
-+ first = mpnt->vm_end + PGDIR_SIZE - 1;
-+ last = mpnt->vm_start;
-+ }
-+ mpnt = mpnt->vm_next;
-+ }
-+
- if (last < first)
- return;
- /*
-@@ -1106,7 +1114,7 @@
- extra = unmap_vma(mm, addr, len, mpnt, extra);
- }
-
-- free_pgtables(mm, prev, addr, addr+len);
-+ free_pgtables(mm, prev, NULL, addr, addr+len);
-
- return extra;
- }
-@@ -1130,7 +1138,7 @@
- find_vma_prev(mm, mpnt->vm_start, &prev);
- extra_m = unmap_vma(mm, addr_m, len, mpnt, extra_m);
-
-- free_pgtables(mm, prev, start, end);
-+ free_pgtables(mm, prev, free_m, start, end);
- }
-
- return extra_m;
+++ /dev/null
-diff -Nru linux-2.4.28/fs/exec.c linux-2.4.28.plasmaroo/fs/exec.c
---- linux-2.4.28/fs/exec.c 2004-04-15 10:44:45 -07:00
-+++ linux-2.4.28.plasmaroo/fs/exec.c 2004-11-12 12:02:40 -08:00
-@@ -342,6 +342,7 @@ int setup_arg_pages(struct linux_binprm
-
- down_write(¤t->mm->mmap_sem);
- {
-+ struct vm_area_struct *vma;
- mpnt->vm_mm = current->mm;
- mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;
- mpnt->vm_end = STACK_TOP;
-@@ -351,6 +352,12 @@ int setup_arg_pages(struct linux_binprm
- mpnt->vm_pgoff = 0;
- mpnt->vm_file = NULL;
- mpnt->vm_private_data = (void *) 0;
-+ vma = find_vma(current->mm, mpnt->vm_start);
-+ if (vma) {
-+ up_write(¤t->mm->mmap_sem);
-+ kmem_cache_free(vm_area_cachep, mpnt);
-+ return -ENOMEM;
-+ }
- insert_vm_struct(current->mm, mpnt);
- current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
- }
-diff -Nru linux-2.4.28/fs/exec.c linux-2.4.28.plasmaroo/fs/exec.c
---- linux-2.4.28/fs/binfmt_aout.c 2002-02-04 23:54:04 -08:00
-+++ linux-2.4.28.plasmaroo/fs/binfmt_aout.c 2004-11-12 11:55:14 -08:00
-@@ -39,13 +39,18 @@ static struct linux_binfmt aout_format =
- NULL, THIS_MODULE, load_aout_binary, load_aout_library, aout_core_dump, PAGE_SIZE
- };
-
--static void set_brk(unsigned long start, unsigned long end)
-+#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE)
-+
-+static int set_brk(unsigned long start, unsigned long end)
- {
- start = PAGE_ALIGN(start);
- end = PAGE_ALIGN(end);
-- if (end <= start)
-- return;
-- do_brk(start, end - start);
-+ if (end > start) {
-+ unsigned long addr = do_brk(start, end - start);
-+ if (BAD_ADDR(addr))
-+ return addr;
-+ }
-+ return 0;
- }
-
- /*
-@@ -405,7 +410,11 @@ static int load_aout_binary(struct linux
- beyond_if:
- set_binfmt(&aout_format);
-
-- set_brk(current->mm->start_brk, current->mm->brk);
-+ retval = set_brk(current->mm->start_brk, current->mm->brk);
-+ if (retval < 0) {
-+ send_sig(SIGKILL, current, 0);
-+ return retval;
-+ }
-
- retval = setup_arg_pages(bprm);
- if (retval < 0) {
+++ /dev/null
---- linux-2.4/fs/proc/base.c 2004-04-15 07:09:32.000000000 +0100
-+++ linux-2.4/fs/proc/base.c.plasmaroo 2004-08-09 23:30:43.869195800 +0100
-@@ -187,7 +187,7 @@ static int proc_pid_cmdline(struct task_
- if (mm)
- atomic_inc(&mm->mm_users);
- task_unlock(task);
-- if (mm) {
-+ if (mm && mm->arg_end) {
- int len = mm->arg_end - mm->arg_start;
- if (len > PAGE_SIZE)
- len = PAGE_SIZE;
+++ /dev/null
-diff -ur linux-2.4.28-gentoo-r2/arch/ia64/ia32/binfmt_elf32.c linux-2.4.28-gentoo-r3/arch/ia64/ia32/binfmt_elf32.c
---- linux-2.4.28-gentoo-r2/arch/ia64/ia32/binfmt_elf32.c 2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/ia64/ia32/binfmt_elf32.c 2004-12-24 14:34:29.531899728 +0000
-@@ -95,7 +95,11 @@
- vma->vm_private_data = NULL;
- down_write(¤t->mm->mmap_sem);
- {
-- insert_vm_struct(current->mm, vma);
-+ if (insert_vm_struct(current->mm, vma)) {
-+ kmem_cache_free(vm_area_cachep, vma);
-+ up_write(¤t->mm->mmap_sem);
-+ return;
-+ }
- }
- up_write(¤t->mm->mmap_sem);
- }
-@@ -117,7 +121,11 @@
- vma->vm_private_data = NULL;
- down_write(¤t->mm->mmap_sem);
- {
-- insert_vm_struct(current->mm, vma);
-+ if (insert_vm_struct(current->mm, vma)) {
-+ kmem_cache_free(vm_area_cachep, vma);
-+ up_write(¤t->mm->mmap_sem);
-+ return;
-+ }
- }
- up_write(¤t->mm->mmap_sem);
- }
-@@ -164,7 +172,7 @@
- {
- unsigned long stack_base;
- struct vm_area_struct *mpnt;
-- int i;
-+ int i, ret;
-
- stack_base = IA32_STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE;
-
-@@ -188,7 +196,11 @@
- mpnt->vm_pgoff = 0;
- mpnt->vm_file = NULL;
- mpnt->vm_private_data = 0;
-- insert_vm_struct(current->mm, mpnt);
-+ if ((ret = insert_vm_struct(current->mm, mpnt))) {
-+ up_write(¤t->mm->mmap_sem);
-+ kmem_cache_free(vm_area_cachep, mpnt);
-+ return ret;
-+ }
- current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
- }
-
-diff -ur linux-2.4.28-gentoo-r2/arch/ia64/kernel/perfmon.c linux-2.4.28-gentoo-r3/arch/ia64/kernel/perfmon.c
---- linux-2.4.28-gentoo-r2/arch/ia64/kernel/perfmon.c 2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/ia64/kernel/perfmon.c 2004-12-24 14:34:29.534899272 +0000
-@@ -967,7 +967,8 @@
- * now insert the vma in the vm list for the process, must be
- * done with mmap lock held
- */
-- insert_vm_struct(mm, vma);
-+ if(insert_vm_struct(mm, vma)) /* Handle -ENOMEM et al. */
-+ goto error;
-
- mm->total_vm += size >> PAGE_SHIFT;
-
-diff -ur linux-2.4.28-gentoo-r2/arch/ia64/mm/init.c linux-2.4.28-gentoo-r3/arch/ia64/mm/init.c
---- linux-2.4.28-gentoo-r2/arch/ia64/mm/init.c 2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/ia64/mm/init.c 2004-12-24 14:34:29.535899120 +0000
-@@ -105,7 +105,13 @@
- vma->vm_pgoff = 0;
- vma->vm_file = NULL;
- vma->vm_private_data = NULL;
-- insert_vm_struct(current->mm, vma);
-+ down_write(¤t->mm->mmap_sem);
-+ if (insert_vm_struct(current->mm, vma)) {
-+ up_write(¤t->mm->mmap_sem);
-+ kmem_cache_free(vm_area_cachep, vma);
-+ return;
-+ }
-+ up_write(¤t->mm->mmap_sem);
- }
-
- /* map NaT-page at address zero to speed up speculative dereferencing of NULL: */
-@@ -117,7 +123,13 @@
- vma->vm_end = PAGE_SIZE;
- vma->vm_page_prot = __pgprot(pgprot_val(PAGE_READONLY) | _PAGE_MA_NAT);
- vma->vm_flags = VM_READ | VM_MAYREAD | VM_IO | VM_RESERVED;
-- insert_vm_struct(current->mm, vma);
-+ down_write(¤t->mm->mmap_sem);
-+ if (insert_vm_struct(current->mm, vma)) {
-+ up_write(¤t->mm->mmap_sem);
-+ kmem_cache_free(vm_area_cachep, vma);
-+ return;
-+ }
-+ up_write(¤t->mm->mmap_sem);
- }
- }
- }
-diff -ur linux-2.4.28-gentoo-r2/arch/ppc/mm/fault.c linux-2.4.28-gentoo-r3/arch/ppc/mm/fault.c
---- linux-2.4.28-gentoo-r2/arch/ppc/mm/fault.c 2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/ppc/mm/fault.c 2004-12-24 14:34:29.543897904 +0000
-@@ -83,8 +83,10 @@
- nopage: pax_syscall_nopage,
- };
-
--static void pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
-+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
- {
-+ int ret;
-+
- vma->vm_mm = current->mm;
- vma->vm_start = addr;
- vma->vm_end = addr + PAGE_SIZE;
-@@ -94,8 +96,15 @@
- vma->vm_pgoff = 0UL;
- vma->vm_file = NULL;
- vma->vm_private_data = NULL;
-- insert_vm_struct(current->mm, vma);
-+ ret = insert_vm_struct(current->mm, vma);
-+ if(ret != 0)
-+ {
-+ up_write(¤t->mm->mmap_sem);
-+ kmem_cache_free(vm_area_cachep, vma);
-+ return ret;
-+ }
- ++current->mm->total_vm;
-+ return 0;
- }
- #endif
-
-@@ -333,7 +342,8 @@
- return 1;
- }
-
-- pax_insert_vma(vma, call_syscall);
-+ if(pax_insert_vma(vma, call_syscall))
-+ return 1; /* VMA overlapping attempt; bye bye! */
- current->mm->call_syscall = call_syscall;
- up_write(¤t->mm->mmap_sem);
-
-@@ -377,7 +387,8 @@
- return 1;
- }
-
-- pax_insert_vma(vma, call_syscall);
-+ if(pax_insert_vma(vma, call_syscall))
-+ return 1; /* VMA overlapping attempt; bye bye! */
- current->mm->call_syscall = call_syscall;
- up_write(¤t->mm->mmap_sem);
-
-diff -ur linux-2.4.28-gentoo-r2/arch/s390x/kernel/exec32.c linux-2.4.28-gentoo-r3/arch/s390x/kernel/exec32.c
---- linux-2.4.28-gentoo-r2/arch/s390x/kernel/exec32.c 2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/s390x/kernel/exec32.c 2004-12-24 14:34:29.543897904 +0000
-@@ -41,7 +41,7 @@
- {
- unsigned long stack_base;
- struct vm_area_struct *mpnt;
-- int i;
-+ int i, ret;
-
- stack_base = STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE;
-
-@@ -65,7 +65,11 @@
- mpnt->vm_pgoff = 0;
- mpnt->vm_file = NULL;
- mpnt->vm_private_data = (void *) 0;
-- insert_vm_struct(current->mm, mpnt);
-+ if ((ret = insert_vm_struct(current->mm, mpnt))) {
-+ up_write(¤t->mm->mmap_sem);
-+ kmem_cache_free(vm_area_cachep, mpnt);
-+ return ret;
-+ }
- current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
- }
-
-diff -ur linux-2.4.28-gentoo-r2/arch/sparc/mm/fault.c linux-2.4.28-gentoo-r3/arch/sparc/mm/fault.c
---- linux-2.4.28-gentoo-r2/arch/sparc/mm/fault.c 2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/sparc/mm/fault.c 2004-12-24 14:34:29.544897752 +0000
-@@ -250,8 +250,10 @@
- nopage: pax_emuplt_nopage,
- };
-
--static void pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
-+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
- {
-+ int ret;
-+
- vma->vm_mm = current->mm;
- vma->vm_start = addr;
- vma->vm_end = addr + PAGE_SIZE;
-@@ -261,8 +263,15 @@
- vma->vm_pgoff = 0UL;
- vma->vm_file = NULL;
- vma->vm_private_data = NULL;
-- insert_vm_struct(current->mm, vma);
-+ ret = insert_vm_struct(current->mm, vma);
-+ if(ret != 0)
-+ {
-+ up_write(¤t->mm->mmap_sem);
-+ kmem_cache_free(vm_area_cachep, vma);
-+ return ret;
-+ }
- ++current->mm->total_vm;
-+ return 0;
- }
-
- /*
-@@ -423,7 +432,8 @@
- return 1;
- }
-
-- pax_insert_vma(vma, call_dl_resolve);
-+ if(pax_insert_vma(vma, call_dl_resolve))
-+ return 1; /* VMA overlapping attempt; bye bye! */
- current->mm->call_dl_resolve = call_dl_resolve;
- up_write(¤t->mm->mmap_sem);
-
-diff -ur linux-2.4.28-gentoo-r2/arch/sparc64/mm/fault.c linux-2.4.28-gentoo-r3/arch/sparc64/mm/fault.c
---- linux-2.4.28-gentoo-r2/arch/sparc64/mm/fault.c 2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/sparc64/mm/fault.c 2004-12-24 14:34:29.559895472 +0000
-@@ -338,8 +338,10 @@
- nopage: pax_emuplt_nopage,
- };
-
--static void pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
-+static int pax_insert_vma(struct vm_area_struct *vma, unsigned long addr)
- {
-+ int ret;
-+
- vma->vm_mm = current->mm;
- vma->vm_start = addr;
- vma->vm_end = addr + PAGE_SIZE;
-@@ -349,8 +351,15 @@
- vma->vm_pgoff = 0UL;
- vma->vm_file = NULL;
- vma->vm_private_data = NULL;
-- insert_vm_struct(current->mm, vma);
-+ ret = insert_vm_struct(current->mm, vma);
-+ if(ret != 0)
-+ {
-+ up_write(¤t->mm->mmap_sem);
-+ kmem_cache_free(vm_area_cachep, vma);
-+ return ret;
-+ }
- ++current->mm->total_vm;
-+ return 0;
- }
- #endif
-
-@@ -609,7 +618,8 @@
- return 1;
- }
-
-- pax_insert_vma(vma, call_dl_resolve);
-+ if(pax_insert_vma(vma, call_dl_resolve))
-+ return 1; /* VMA overlapping attempt; bye bye! */
- current->mm->call_dl_resolve = call_dl_resolve;
- up_write(¤t->mm->mmap_sem);
-
-diff -ur linux-2.4.28-gentoo-r2/arch/x86_64/ia32/ia32_binfmt.c linux-2.4.28-gentoo-r3/arch/x86_64/ia32/ia32_binfmt.c
---- linux-2.4.28-gentoo-r2/arch/x86_64/ia32/ia32_binfmt.c 2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/arch/x86_64/ia32/ia32_binfmt.c 2004-12-24 14:34:29.559895472 +0000
-@@ -225,7 +225,7 @@
- {
- unsigned long stack_base;
- struct vm_area_struct *mpnt;
-- int i;
-+ int i, ret;
-
- stack_base = IA32_STACK_TOP - MAX_ARG_PAGES*PAGE_SIZE;
-
-@@ -250,7 +250,11 @@
- mpnt->vm_pgoff = 0;
- mpnt->vm_file = NULL;
- mpnt->vm_private_data = (void *) 0;
-- insert_vm_struct(current->mm, mpnt);
-+ if ((ret = insert_vm_struct(current->mm, mpnt))) {
-+ up_write(¤t->mm->mmap_sem);
-+ kmem_cache_free(vm_area_cachep, mpnt);
-+ return ret;
-+ }
- current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
- }
-
-diff -ur linux-2.4.28-gentoo-r2/fs/exec.c linux-2.4.28-gentoo-r3/fs/exec.c
---- linux-2.4.28-gentoo-r2/fs/exec.c 2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/fs/exec.c 2004-12-24 14:35:52.000000000 +0000
-@@ -358,7 +358,7 @@
- {
- unsigned long stack_base;
- struct vm_area_struct *mpnt;
-- int i;
-+ int i, ret;
-
- #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC
- struct vm_area_struct *mpnt_m = NULL;
-@@ -387,7 +387,6 @@
-
- down_write(¤t->mm->mmap_sem);
- {
-- struct vm_area_struct *vma;
- mpnt->vm_mm = current->mm;
- mpnt->vm_start = PAGE_MASK & (unsigned long) bprm->p;
- mpnt->vm_end = STACK_TOP;
-@@ -402,13 +401,11 @@
- mpnt->vm_pgoff = 0;
- mpnt->vm_file = NULL;
- mpnt->vm_private_data = (void *) 0;
-- vma = find_vma(current->mm, mpnt->vm_start);
-- if (vma) {
-+ if ((ret = insert_vm_struct(current->mm, mpnt))) {
- up_write(¤t->mm->mmap_sem);
- kmem_cache_free(vm_area_cachep, mpnt);
-- return -ENOMEM;
-+ return ret;
- }
-- insert_vm_struct(current->mm, mpnt);
- current->mm->total_vm = (mpnt->vm_end - mpnt->vm_start) >> PAGE_SHIFT;
-
- #ifdef CONFIG_GRKERNSEC_PAX_SEGMEXEC
-diff -ur linux-2.4.28-gentoo-r2/include/linux/mm.h linux-2.4.28-gentoo-r3/include/linux/mm.h
---- linux-2.4.28-gentoo-r2/include/linux/mm.h 2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/include/linux/mm.h 2004-12-24 14:34:29.000000000 +0000
-@@ -577,7 +577,7 @@
- /* mmap.c */
- extern void lock_vma_mappings(struct vm_area_struct *);
- extern void unlock_vma_mappings(struct vm_area_struct *);
--extern void insert_vm_struct(struct mm_struct *, struct vm_area_struct *);
-+extern int insert_vm_struct(struct mm_struct *, struct vm_area_struct *);
- extern void __insert_vm_struct(struct mm_struct *, struct vm_area_struct *);
- extern void build_mmap_rb(struct mm_struct *);
- extern void exit_mmap(struct mm_struct *);
-diff -ur linux-2.4.28-gentoo-r2/mm/mmap.c linux-2.4.28-gentoo-r3/mm/mmap.c
---- linux-2.4.28-gentoo-r2/mm/mmap.c 2004-11-27 20:50:07.000000000 +0000
-+++ linux-2.4.28-gentoo-r3/mm/mmap.c 2004-12-24 14:34:29.000000000 +0000
-@@ -1480,14 +1480,15 @@
- validate_mm(mm);
- }
-
--void insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
-+int insert_vm_struct(struct mm_struct * mm, struct vm_area_struct * vma)
- {
- struct vm_area_struct * __vma, * prev;
- rb_node_t ** rb_link, * rb_parent;
-
- __vma = find_vma_prepare(mm, vma->vm_start, &prev, &rb_link, &rb_parent);
- if (__vma && __vma->vm_start < vma->vm_end)
-- BUG();
-+ return -ENOMEM;
- vma_link(mm, vma, prev, rb_link, rb_parent);
- validate_mm(mm);
-+ return 0;
- }
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.4.28-r9.ebuild,v 1.2 2005/11/02 00:00:39 vapier Exp $
-
-ETYPE="sources"
-inherit kernel-2
-detect_version
-
-KEYWORDS="x86 -ppc"
-IUSE=""
-
-UNIPATCH_STRICTORDER='Y'
-UNIPATCH_LIST="${DISTDIR}/${PF/r9/r4}.tar.bz2
- ${DISTDIR}/ck-sources-${PV}-CAN-2004-0814.patch
- ${FILESDIR}/${PN}-2.4.cmdlineLeak.patch
- ${FILESDIR}/${PN}-2.4.binfmt_a.out.patch
- ${FILESDIR}/${PN}-2.4.vma.patch
- ${FILESDIR}/${PN}-2.4.CAN-2004-1016.patch
- ${FILESDIR}/${PN}-2.4.CAN-2004-1056.patch
- ${FILESDIR}/${PN}-2.4.CAN-2004-1137.patch
- ${FILESDIR}/${PN}-2.4.77094.patch
- ${FILESDIR}/${P}.brk-locked.patch
- ${FILESDIR}/${PN}-2.4.77666.patch
- ${FILESDIR}/${PN}-2.4.78362.patch
- ${FILESDIR}/${PN}-2.4.78363.patch
- ${FILESDIR}/${PN}-2.4.81106.patch
- ${FILESDIR}/${P}.arpFix.patch
- ${FILESDIR}/${P}.77181.patch
- ${FILESDIR}/${PN}-2.4.PaX-84167.patch
- ${FILESDIR}/${PN}-2.4.81195.patch
- ${FILESDIR}/${PN}-2.4.81295.patch
- ${FILESDIR}/${PN}-2.4.82201.patch"
-
-DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} http://dev.gentoo.org/~plasmaroo/patches/kernel/gentoo-sources/${PF/r9/r4}.tar.bz2
- http://dev.gentoo.org/~plasmaroo/patches/kernel/misc/security/ck-sources-${PV}-CAN-2004-0814.patch"
+++ /dev/null
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/gentoo-sources/gentoo-sources-2.6.13-r3.ebuild,v 1.5 2005/10/10 12:16:03 metalgod Exp $
-
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras"
-K_GENPATCHES_VER="5"
-IUSE="ultra1"
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="amd64 -ia64 ppc ~ppc64 x86"
-
-HOMEPAGE="http://dev.gentoo.org/~dsd/genpatches"
-
-DESCRIPTION="Full sources including the gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
-SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
-
-pkg_setup() {
- if use sparc; then
- # hme lockup hack on ultra1
- use ultra1 || UNIPATCH_EXCLUDE="${UNIPATCH_EXCLUDE} 1399_sparc-U1-hme-lockup.patch"
- fi
-}
-
-pkg_postinst() {
- postinst_sources
-
- echo
-
- if [ "${ARCH}" = "sparc" ]; then
- if [ x"`cat /proc/openprom/name 2>/dev/null`" \
- = x"'SUNW,Ultra-1'" ]; then
- einfo "For users with an Enterprise model Ultra 1 using the HME"
- einfo "network interface, please emerge the kernel using the"
- einfo "following command: USE=ultra1 emerge ${PN}"
- fi
- fi
- einfo "For more info on this patchset, and how to report problems, see:"
- einfo "${HOMEPAGE}"
-}
projects / gentoo.git / commitdiff