From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Wed, 19 Mar 2008 16:30:52 +0000 (+0000)
Subject: Attempt to fix the ip_conntrack crash
X-Git-Tag: trellis-2.6.22-Jan-2009~36
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1668c686acca7ecfbf8d4cab0b621d51d96ad927;p=linux-2.6.git

Attempt to fix the ip_conntrack crash
---

diff --git a/linux-2.6-520-vnet+.patch b/linux-2.6-520-vnet+.patch
index 27a710882..f1aaa0b31 100644
--- a/linux-2.6-520-vnet+.patch
+++ b/linux-2.6-520-vnet+.patch
@@ -756,7 +756,7 @@ diff -Nurb linux-2.6.22-510/net/netfilter/xt_MARK.c.orig linux-2.6.22-520/net/ne
 +
 +	case XT_MARK_COPYXID: {
 +		enum ip_conntrack_info ctinfo;
-+		struct sock *connection_sk;
++		struct sock *connection_sk=NULL;
 +		int dif;
 +
 +		struct nf_conn *ct = nf_ct_get((*pskb), &ctinfo);