[kernel] r8044 - in dists/sid/linux-2.6/debian: . patches/bugfix patches/series

[maximilian attems]

Author: maks-guest
Date: Thu Dec 28 22:52:57 2006
New Revision: 8044

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/2.6.16.36
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9
Log:
add open 2.6.16.36 fixes


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Thu Dec 28 22:52:57 2006
@@ -60,8 +60,11 @@
     - [PKT_SCHED] act_gact: division by zero
     - [NET_SCHED]: policer: restore compatibility with old iproute binaries
     - proper flags type of spin_lock_irqsave()
+  * Hand-picked from stable release 2.6.16.36:
+    - [IPSEC]: Fix inetpeer leak in ipv4 xfrm dst entries.
+    - [XFRM]: Use output device disable_xfrm for forwarded packets
 
- -- maximilian attems <maks at sternwelten.at>  Thu, 28 Dec 2006 22:43:53 +0100
+ -- maximilian attems <maks at sternwelten.at>  Thu, 28 Dec 2006 22:51:19 +0100
 
 linux-2.6 (2.6.18-8) unstable; urgency=low
 

Added: dists/sid/linux-2.6/debian/patches/bugfix/2.6.16.36
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/2.6.16.36	Thu Dec 28 22:52:57 2006
@@ -0,0 +1,26 @@
+diff --git a/net/ipv4/route.c b/net/ipv4/route.c
+index c2cd901..c83066c 100644
+--- a/net/ipv4/route.c
++++ b/net/ipv4/route.c
+@@ -1768,7 +1768,7 @@ static inline int __mkroute_input(struct sk_buff *skb,
+ #endif
+ 	if (in_dev->cnf.no_policy)
+ 		rth->u.dst.flags |= DST_NOPOLICY;
+-	if (in_dev->cnf.no_xfrm)
++	if (out_dev->cnf.no_xfrm)
+ 		rth->u.dst.flags |= DST_NOXFRM;
+ 	rth->fl.fl4_dst	= daddr;
+ 	rth->rt_dst	= daddr;
+diff --git a/net/ipv4/xfrm4_policy.c b/net/ipv4/xfrm4_policy.c
+index f285bbf..0955360 100644
+--- a/net/ipv4/xfrm4_policy.c
++++ b/net/ipv4/xfrm4_policy.c
+@@ -257,6 +257,8 @@ static void xfrm4_dst_destroy(struct dst_entry *dst)
+ 
+ 	if (likely(xdst->u.rt.idev))
+ 		in_dev_put(xdst->u.rt.idev);
++	if (likely(xdst->u.rt.peer))
++		inet_putpeer(xdst->u.rt.peer);
+ 	xfrm_dst_destroy(xdst);
+ }
+ 

Modified: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9	(original)
+++ dists/sid/linux-2.6/debian/patches/series/9	Thu Dec 28 22:52:57 2006
@@ -18,3 +18,4 @@
 + bugfix/mincore-typo.patch
 + bugfix/2.6.16.34
 + bugfix/2.6.16.35
++ bugfix/2.6.16.36