summaryrefslogtreecommitdiffstats
path: root/patches/source/linux-2.6.29.6-3
diff options
context:
space:
mode:
Diffstat (limited to 'patches/source/linux-2.6.29.6-3')
-rw-r--r--patches/source/linux-2.6.29.6-3/linux-2.6.29.6-01-sendpage.diff11
-rw-r--r--patches/source/linux-2.6.29.6-3/linux-2.6.29.6-02-default-mmap_min_addr-4096.diff22
-rw-r--r--patches/source/linux-2.6.29.6-3/linux-2.6.29.6-03-ip_fragment-CVE-2009-1298.diff11
3 files changed, 44 insertions, 0 deletions
diff --git a/patches/source/linux-2.6.29.6-3/linux-2.6.29.6-01-sendpage.diff b/patches/source/linux-2.6.29.6-3/linux-2.6.29.6-01-sendpage.diff
new file mode 100644
index 000000000..d1e7a07af
--- /dev/null
+++ b/patches/source/linux-2.6.29.6-3/linux-2.6.29.6-01-sendpage.diff
@@ -0,0 +1,11 @@
+--- ./net/socket.c.orig 2009-08-02 14:29:53.000000000 -0500
++++ ./net/socket.c 2009-08-15 13:03:44.000000000 -0500
+@@ -694,7 +694,7 @@
+ if (more)
+ flags |= MSG_MORE;
+
+- return sock->ops->sendpage(sock, page, offset, size, flags);
++ return kernel_sendpage(sock, page, offset, size, flags);
+ }
+
+ static ssize_t sock_splice_read(struct file *file, loff_t *ppos,
diff --git a/patches/source/linux-2.6.29.6-3/linux-2.6.29.6-02-default-mmap_min_addr-4096.diff b/patches/source/linux-2.6.29.6-3/linux-2.6.29.6-02-default-mmap_min_addr-4096.diff
new file mode 100644
index 000000000..53d2b5a02
--- /dev/null
+++ b/patches/source/linux-2.6.29.6-3/linux-2.6.29.6-02-default-mmap_min_addr-4096.diff
@@ -0,0 +1,22 @@
+--- ./arch/x86/configs/i386_defconfig.orig 2009-07-02 18:41:20.000000000 -0500
++++ ./arch/x86/configs/i386_defconfig 2009-08-16 21:03:21.000000000 -0500
+@@ -2127,7 +2127,7 @@
+ # CONFIG_SECURITY_NETWORK_XFRM is not set
+ CONFIG_SECURITY_FILE_CAPABILITIES=y
+ # CONFIG_SECURITY_ROOTPLUG is not set
+-CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
++CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=4096
+ CONFIG_SECURITY_SELINUX=y
+ CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
+--- ./arch/x86/configs/x86_64_defconfig.orig 2009-07-02 18:41:20.000000000 -0500
++++ ./arch/x86/configs/x86_64_defconfig 2009-08-16 21:03:33.000000000 -0500
+@@ -2096,7 +2096,7 @@
+ # CONFIG_SECURITY_NETWORK_XFRM is not set
+ CONFIG_SECURITY_FILE_CAPABILITIES=y
+ # CONFIG_SECURITY_ROOTPLUG is not set
+-CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536
++CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=4096
+ CONFIG_SECURITY_SELINUX=y
+ CONFIG_SECURITY_SELINUX_BOOTPARAM=y
+ CONFIG_SECURITY_SELINUX_BOOTPARAM_VALUE=1
diff --git a/patches/source/linux-2.6.29.6-3/linux-2.6.29.6-03-ip_fragment-CVE-2009-1298.diff b/patches/source/linux-2.6.29.6-3/linux-2.6.29.6-03-ip_fragment-CVE-2009-1298.diff
new file mode 100644
index 000000000..bf49b3dcf
--- /dev/null
+++ b/patches/source/linux-2.6.29.6-3/linux-2.6.29.6-03-ip_fragment-CVE-2009-1298.diff
@@ -0,0 +1,11 @@
+--- ./net/ipv4/ip_fragment.c.orig 2009-10-10 00:49:25.000000000 -0500
++++ ./net/ipv4/ip_fragment.c 2009-12-07 14:07:28.000000000 -0600
+@@ -563,7 +563,7 @@
+ printk(KERN_INFO "Oversized IP packet from %pI4.\n",
+ &qp->saddr);
+ out_fail:
+- IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_REASMFAILS);
++ IP_INC_STATS_BH(net, IPSTATS_MIB_REASMFAILS);
+ return err;
+ }
+