rpms/kernel/FC-5 linux-2.6-20.8-unofficial.patch, NONE, 1.1 kernel-2.6.spec, 1.2313, 1.2314

[fedora-cvs-commits at redhat.com]

Author: cebbert

Update of /cvs/dist/rpms/kernel/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv21351

Modified Files:
	kernel-2.6.spec 
Added Files:
	linux-2.6-20.8-unofficial.patch 
Log Message:
* Wed Apr 25 2007 Chuck Ebbert <cebbert at redhat.com>		1.2314
- 2.6.20.8
  Patch taken from mailing list, not available elsewhere.


linux-2.6-20.8-unofficial.patch:
 Makefile                |    2 +-
 net/ipv4/fib_frontend.c |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6-20.8-unofficial.patch ---
diff --git a/Makefile b/Makefile
index bc99522..f3539e8 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 20
-EXTRAVERSION = .7
+EXTRAVERSION = .8
 NAME = Homicidal Dwarf Hamster
 
 # *DOCUMENTATION*
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,
 							    .tos = frn->fl_tos,
 							    .scope = frn->fl_scope } } };
+
+	frn->err = -ENOENT;
 	if (tb) {
 		local_bh_disable();
 
@@ -783,6 +785,7 @@ static void nl_fib_lookup(struct fib_result_nl *frn, struct fib_table *tb )
 			frn->nh_sel = res.nh_sel;
 			frn->type = res.type;
 			frn->scope = res.scope;
+			fib_res_put(&res);
 		}
 		local_bh_enable();
 	}
@@ -797,6 +800,9 @@ static void nl_fib_input(struct sock *sk, int len)
 	struct fib_table *tb;
 	
 	skb = skb_dequeue(&sk->sk_receive_queue);
+	if (skb == NULL)
+		return;
+
 	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)
 
 	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_group = 0;  /* unicast */
 	netlink_unicast(sk, skb, pid, MSG_DONTWAIT);


Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/FC-5/kernel-2.6.spec,v
retrieving revision 1.2313
retrieving revision 1.2314
diff -u -r1.2313 -r1.2314
--- kernel-2.6.spec	17 Apr 2007 20:40:15 -0000	1.2313
+++ kernel-2.6.spec	25 Apr 2007 21:39:56 -0000	1.2314
@@ -317,6 +317,7 @@
 Patch5: patch-2.6.20.4-5.bz2
 Patch6: patch-2.6.20.5-6.bz2
 Patch7: patch-2.6.20.6-7.bz2
+Patch8: linux-2.6-20.8-unofficial.patch
 
 # Patches 10 through 99 are for things that are going upstream really soon.
 
@@ -878,6 +879,7 @@
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
 
 # Patches 10 through 100 are meant for core subsystem upgrades
 
@@ -1888,6 +1890,10 @@
 %endif
 
 %changelog
+* Wed Apr 25 2007 Chuck Ebbert <cebbert at redhat.com>		1.2314
+- 2.6.20.8
+  Patch taken from mailing list, not available elsewhere.
+
 * Tue Apr 17 2007 Chuck Ebbert <cebbert at redhat.com>		1.2313
 - 2.6.20.7