[pve-devel] r6590 - pve-kernel-2.6.32/trunk
svn-commits at proxmox.com
svn-commits at proxmox.com
Wed Jan 11 06:27:43 CET 2012
Author: dietmar
Date: 2012-01-11 06:27:43 +0100 (Wed, 11 Jan 2012)
New Revision: 6590
Added:
pve-kernel-2.6.32/trunk/ipv4-ip_options_compile-resilient-to-NULL-skb-route.patch
Modified:
pve-kernel-2.6.32/trunk/Makefile
pve-kernel-2.6.32/trunk/README
pve-kernel-2.6.32/trunk/changelog.Debian
pve-kernel-2.6.32/trunk/config-2.6.32.diff
Log:
Modified: pve-kernel-2.6.32/trunk/Makefile
===================================================================
--- pve-kernel-2.6.32/trunk/Makefile 2012-01-10 08:27:01 UTC (rev 6589)
+++ pve-kernel-2.6.32/trunk/Makefile 2012-01-11 05:27:43 UTC (rev 6590)
@@ -139,6 +139,8 @@
cd ${KERNEL_SRC}; patch -p1 <../do-not-use-barrier-on-ext3.patch
cd ${KERNEL_SRC}; patch -p1 <../bridge-patch.diff
cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
+ # hack: avoid crash on 'ping -R' - openvz bug # 2133
+ cd ${KERNEL_SRC}; patch -p1 <../ipv4-ip_options_compile-resilient-to-NULL-skb-route.patch
sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
touch $@
Modified: pve-kernel-2.6.32/trunk/README
===================================================================
--- pve-kernel-2.6.32/trunk/README 2012-01-10 08:27:01 UTC (rev 6589)
+++ pve-kernel-2.6.32/trunk/README 2012-01-11 05:27:43 UTC (rev 6590)
@@ -91,11 +91,15 @@
CONFIG_BLK_DEV_SR=y
CONFIG_BLK_DEV_DM=y
-- CONFIG_RT_GROUP_SCHED to avoid corosync startup errors
-
- disable module signatures (CONFIG_MODULE_SIG, CONFIG_CRYPTO_SIGNATURE)
+- enable usbip (this is also enable on debian kernels)
+ CONFIG_USB_IP_COMMON=m
+ CONFIG_USB_IP_VHCI_HCD=m
+ CONFIG_USB_IP_HOST=m
+
+
Testing final kernel with kvm
-----------------------------
Modified: pve-kernel-2.6.32/trunk/changelog.Debian
===================================================================
--- pve-kernel-2.6.32/trunk/changelog.Debian 2012-01-10 08:27:01 UTC (rev 6589)
+++ pve-kernel-2.6.32/trunk/changelog.Debian 2012-01-11 05:27:43 UTC (rev 6590)
@@ -11,6 +11,11 @@
* update ixgbe to 3.7.17
* remove intel IDE-R support patches (now in upstream)
+
+ * temporary fix for openvz bug #2133
+ patch: ipv4-ip_options_compile-resilient-to-NULL-skb-route.patch
+
+ * enable usbip module
-- Proxmox Support Team <support at proxmox.com> Tue, 10 Jan 2012 07:19:23 +0100
Modified: pve-kernel-2.6.32/trunk/config-2.6.32.diff
===================================================================
--- pve-kernel-2.6.32/trunk/config-2.6.32.diff 2012-01-10 08:27:01 UTC (rev 6589)
+++ pve-kernel-2.6.32/trunk/config-2.6.32.diff 2012-01-11 05:27:43 UTC (rev 6590)
@@ -1,6 +1,6 @@
---- config-2.6.32-042stab037.1.x86_64 2011-09-21 06:21:48.000000000 +0200
-+++ config-2.6.32 2011-09-26 06:15:44.000000000 +0200
-@@ -206,7 +206,7 @@
+--- config-2.6.32-042stab046.1.x86_64 2011-12-30 22:41:45.000000000 +0100
++++ config-2.6.32 2012-01-11 06:20:11.000000000 +0100
+@@ -207,7 +207,7 @@
CONFIG_MODVERSIONS=y
CONFIG_MODULE_SRCVERSION_ALL=y
CONFIG_MODULE_VERIFY_ELF=y
@@ -9,7 +9,7 @@
# CONFIG_MODULE_SIG_FORCE is not set
CONFIG_MODULE_VERIFY=y
CONFIG_STOP_MACHINE=y
-@@ -1323,10 +1323,10 @@
+@@ -1342,10 +1342,10 @@
#
# SCSI support type (disk, tape, CD-ROM)
#
@@ -22,16 +22,16 @@
CONFIG_BLK_DEV_SR_VENDOR=y
CONFIG_CHR_DEV_SG=m
CONFIG_CHR_DEV_SCH=m
-@@ -1404,7 +1404,7 @@
+@@ -1423,7 +1423,7 @@
# CONFIG_SCSI_DMX3191D is not set
# CONFIG_SCSI_EATA is not set
# CONFIG_SCSI_FUTURE_DOMAIN is not set
-# CONFIG_SCSI_GDTH is not set
+CONFIG_SCSI_GDTH=m
CONFIG_SCSI_ISCI=m
- # CONFIG_PBG_HBA_BETA is not set
- CONFIG_PBG_HBA_A2=y
-@@ -1524,7 +1524,7 @@
+ CONFIG_SCSI_IPS=m
+ CONFIG_SCSI_INITIO=m
+@@ -1540,7 +1540,7 @@
# CONFIG_MULTICORE_RAID456 is not set
# CONFIG_MD_MULTIPATH is not set
CONFIG_MD_FAULTY=m
@@ -40,7 +40,7 @@
CONFIG_DM_DEBUG=y
CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m
-@@ -3094,6 +3094,11 @@
+@@ -3118,6 +3118,11 @@
# CONFIG_LOGO_LINUX_MONO is not set
# CONFIG_LOGO_LINUX_VGA16 is not set
CONFIG_LOGO_LINUX_CLUT224=y
@@ -52,7 +52,18 @@
CONFIG_SOUND=m
CONFIG_SOUND_OSS_CORE=y
CONFIG_SOUND_OSS_CORE_PRECLAIM=y
-@@ -4050,7 +4055,7 @@
+@@ -3716,7 +3721,9 @@
+ # CONFIG_SLICOSS is not set
+ # CONFIG_VIDEO_GO7007 is not set
+ # CONFIG_VIDEO_CX25821 is not set
+-# CONFIG_USB_IP_COMMON is not set
++CONFIG_USB_IP_COMMON=m
++CONFIG_USB_IP_VHCI_HCD=m
++CONFIG_USB_IP_HOST=m
+ # CONFIG_W35UND is not set
+ # CONFIG_PRISM2_USB is not set
+ # CONFIG_ECHO is not set
+@@ -4083,7 +4090,7 @@
# Kernel hacking
#
CONFIG_TRACE_IRQFLAGS_SUPPORT=y
@@ -61,7 +72,7 @@
# CONFIG_ENABLE_WARN_DEPRECATED is not set
CONFIG_ENABLE_MUST_CHECK=y
CONFIG_FRAME_WARN=2048
-@@ -4094,7 +4099,7 @@
+@@ -4127,7 +4134,7 @@
CONFIG_STACKTRACE=y
# CONFIG_DEBUG_KOBJECT is not set
CONFIG_DEBUG_BUGVERBOSE=y
@@ -70,7 +81,7 @@
# CONFIG_DEBUG_VM is not set
# CONFIG_DEBUG_VIRTUAL is not set
# CONFIG_DEBUG_WRITECOUNT is not set
-@@ -4323,8 +4328,8 @@
+@@ -4356,8 +4363,8 @@
#
CONFIG_CRYPTO_ANSI_CPRNG=m
CONFIG_CRYPTO_MPILIB=y
Added: pve-kernel-2.6.32/trunk/ipv4-ip_options_compile-resilient-to-NULL-skb-route.patch
===================================================================
--- pve-kernel-2.6.32/trunk/ipv4-ip_options_compile-resilient-to-NULL-skb-route.patch (rev 0)
+++ pve-kernel-2.6.32/trunk/ipv4-ip_options_compile-resilient-to-NULL-skb-route.patch 2012-01-11 05:27:43 UTC (rev 6590)
@@ -0,0 +1,57 @@
+From c65353daf137dd41f3ede3baf62d561fca076228 Mon Sep 17 00:00:00 2001
+From: Eric Dumazet <eric.dumazet at gmail.com>
+Date: Thu, 14 Apr 2011 05:55:37 +0000
+Subject: [PATCH] ip: ip_options_compile() resilient to NULL skb route
+
+Scot Doyle demonstrated ip_options_compile() could be called with an skb
+without an attached route, using a setup involving a bridge, netfilter,
+and forged IP packets.
+
+Let's make ip_options_compile() and ip_options_rcv_srr() a bit more
+robust, instead of changing bridge/netfilter code.
+
+With help from Hiroaki SHIMODA.
+
+Reported-by: Scot Doyle <lkml at scotdoyle.com>
+Tested-by: Scot Doyle <lkml at scotdoyle.com>
+Signed-off-by: Eric Dumazet <eric.dumazet at gmail.com>
+Cc: Stephen Hemminger <shemminger at vyatta.com>
+Acked-by: Hiroaki SHIMODA <shimoda.hiroaki at gmail.com>
+Signed-off-by: David S. Miller <davem at davemloft.net>
+---
+ net/ipv4/ip_options.c | 6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c
+index 28a736f..2391b24 100644
+--- a/net/ipv4/ip_options.c
++++ b/net/ipv4/ip_options.c
+@@ -329,7 +329,7 @@ int ip_options_compile(struct net *net,
+ pp_ptr = optptr + 2;
+ goto error;
+ }
+- if (skb) {
++ if (rt) {
+ memcpy(&optptr[optptr[2]-1], &rt->rt_spec_dst, 4);
+ opt->is_changed = 1;
+ }
+@@ -371,7 +371,7 @@ int ip_options_compile(struct net *net,
+ goto error;
+ }
+ opt->ts = optptr - iph;
+- if (skb) {
++ if (rt) {
+ memcpy(&optptr[optptr[2]-1], &rt->rt_spec_dst, 4);
+ timeptr = (__be32*)&optptr[optptr[2]+3];
+ }
+@@ -603,7 +603,7 @@ int ip_options_rcv_srr(struct sk_buff *skb)
+ unsigned long orefdst;
+ int err;
+
+- if (!opt->srr)
++ if (!opt->srr || !rt)
+ return 0;
+
+ if (skb->pkt_type != PACKET_HOST)
+--
+1.7.6.5
More information about the pve-devel
mailing list