[kernel] r8556 - dists/etch-security/linux-2.6/debian/patches/bugfix

[Dann Frazier]

Author: dannf
Date: Tue May  1 21:55:01 2007
New Revision: 8556

Modified:
   dists/etch-security/linux-2.6/debian/patches/bugfix/netlink-infinite-recursion.patch
Log:
adjust to apply in the linux-2.6 build

Modified: dists/etch-security/linux-2.6/debian/patches/bugfix/netlink-infinite-recursion.patch
==============================================================================
--- dists/etch-security/linux-2.6/debian/patches/bugfix/netlink-infinite-recursion.patch	(original)
+++ dists/etch-security/linux-2.6/debian/patches/bugfix/netlink-infinite-recursion.patch	Tue May  1 21:55:01 2007
@@ -24,12 +24,11 @@
 Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
 ---
 
-diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c
-index d47b72a..fa2cb8c 100644
---- a/net/ipv4/fib_frontend.c
-+++ b/net/ipv4/fib_frontend.c
-@@ -772,6 +772,8 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
- 				       .nl_u = { .ip4_u = { .daddr = frn->fl_addr,
+diff -urN linux-source-2.6.18.orig/net/ipv4/fib_frontend.c linux-source-2.6.18/net/ipv4/fib_frontend.c
+--- linux-source-2.6.18.orig/net/ipv4/fib_frontend.c	2006-09-19 21:42:06.000000000 -0600
++++ linux-source-2.6.18/net/ipv4/fib_frontend.c	2007-05-01 15:21:37.000000000 -0600
+@@ -524,6 +524,8 @@
+ 							    .fwmark = frn->fl_fwmark,
  							    .tos = frn->fl_tos,
  							    .scope = frn->fl_scope } } };
 +
@@ -37,7 +36,7 @@
  	if (tb) {
  		local_bh_disable();
  
-@@ -783,6 +785,7 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
+@@ -535,6 +537,7 @@
  			frn->nh_sel = res.nh_sel;
  			frn->type = res.type;
  			frn->scope = res.scope;
@@ -45,7 +44,7 @@
  		}
  		local_bh_enable();
  	}
-@@ -797,6 +800,9 @@ static void nl_fib_input(struct sock *sk, int len)
+@@ -549,6 +552,9 @@
  	struct fib_table *tb;
  	
  	skb = skb_dequeue(&sk->sk_receive_queue);
@@ -55,12 +54,12 @@
  	nlh = (struct nlmsghdr *)skb->data;
  	if (skb->len < NLMSG_SPACE(0) || skb->len < nlh->nlmsg_len ||
  	    nlh->nlmsg_len < NLMSG_LENGTH(sizeof(*frn))) {
-@@ -809,7 +815,7 @@ static void nl_fib_input(struct sock *sk, int len)
+@@ -561,7 +567,7 @@
  
  	nl_fib_lookup(frn, tb);
  	
 -	pid = nlh->nlmsg_pid;           /*pid of sending process */
 +	pid = NETLINK_CB(skb).pid;       /* pid of sending process */
  	NETLINK_CB(skb).pid = 0;         /* from kernel */
+ 	NETLINK_CB(skb).dst_pid = pid;
  	NETLINK_CB(skb).dst_group = 0;  /* unicast */
- 	netlink_unicast(sk, skb, pid, MSG_DONTWAIT);