From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Thu, 16 Aug 2007 01:12:24 +0000 (+0000)
Subject: Added peercred = sk->xid, which got lost in the various merges that happened.
X-Git-Tag: linux-2.6-22-1~29
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=a41394cdf15feb3ff01cd6fb03ad095d1bc279d9

Added peercred = sk->xid, which got lost in the various merges that happened.
---

diff --git a/net/netfilter/xt_MARK.c b/net/netfilter/xt_MARK.c
index 3b40a6034..7a44a85c0 100644
--- a/net/netfilter/xt_MARK.c
+++ b/net/netfilter/xt_MARK.c
@@ -142,6 +142,7 @@ target_v1(struct sk_buff **pskb,
 			connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = ct->xid[dir];
 			ct->xid[!dir]=connection_sk->sk_xid;
 			*/
+			connection_sk->sk_peercred.gid = connection_sk->sk_peercred.uid = connection_skb->sk_xid;
 			if (connection_sk->sk_xid != 0) 
 				mark = connection_sk->sk_xid;
 			if (connection_sk != (*pskb)->sk)