[kernel] r16595 - dists/lenny-security/linux-2.6/debian/patches/bugfix/all

[Dann Frazier]

Author: dannf
Date: Thu Nov 25 01:33:34 2010
New Revision: 16595

Log:
fix build issue; var declaration moved

Modified:
   dists/lenny-security/linux-2.6/debian/patches/bugfix/all/inet_diag-make-sure-we-actually-run-the-same-bytecode-we-audited.patch

Modified: dists/lenny-security/linux-2.6/debian/patches/bugfix/all/inet_diag-make-sure-we-actually-run-the-same-bytecode-we-audited.patch
==============================================================================
--- dists/lenny-security/linux-2.6/debian/patches/bugfix/all/inet_diag-make-sure-we-actually-run-the-same-bytecode-we-audited.patch	Thu Nov 25 00:34:42 2010	(r16594)
+++ dists/lenny-security/linux-2.6/debian/patches/bugfix/all/inet_diag-make-sure-we-actually-run-the-same-bytecode-we-audited.patch	Thu Nov 25 01:33:34 2010	(r16595)
@@ -1,4 +1,4 @@
-commit cfd1efb5b8f074aa3d7b7adc98f4a98100880cbb
+commit bbeac6cc190a5978d9fb0cdaadc4275073fbc65e
 Author: Nelson Elhage <nelhage at ksplice.com>
 Date:   Wed Nov 3 16:35:41 2010 +0000
 
@@ -19,10 +19,10 @@
     Signed-off-by: David S. Miller <davem at davemloft.net>
 
 diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c
-index da97695..b9659b2 100644
+index da97695..dc68bb1 100644
 --- a/net/ipv4/inet_diag.c
 +++ b/net/ipv4/inet_diag.c
-@@ -495,10 +495,11 @@ static int inet_csk_diag_dump(struct sock *sk,
+@@ -495,9 +495,11 @@ static int inet_csk_diag_dump(struct sock *sk,
  {
  	struct inet_diag_req *r = NLMSG_DATA(cb->nlh);
  
@@ -30,14 +30,13 @@
 +	if (nlmsg_attrlen(cb->nlh, sizeof(*r))) {
  		struct inet_diag_entry entry;
 -		struct rtattr *bc = (struct rtattr *)(r + 1);
--		struct inet_sock *inet = inet_sk(sk);
 +		const struct nlattr *bc = nlmsg_find_attr(cb->nlh,
 +							  sizeof(*r),
 +							  INET_DIAG_REQ_BYTECODE);
+ 		struct inet_sock *inet = inet_sk(sk);
  
  		entry.family = sk->sk_family;
- #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
-@@ -517,7 +518,7 @@ static int inet_csk_diag_dump(struct sock *sk,
+@@ -517,7 +519,7 @@ static int inet_csk_diag_dump(struct sock *sk,
  		entry.dport = ntohs(inet->dport);
  		entry.userlocks = sk->sk_userlocks;
  
@@ -46,7 +45,7 @@
  			return 0;
  	}
  
-@@ -532,9 +533,11 @@ static int inet_twsk_diag_dump(struct inet_timewait_sock *tw,
+@@ -532,9 +534,11 @@ static int inet_twsk_diag_dump(struct inet_timewait_sock *tw,
  {
  	struct inet_diag_req *r = NLMSG_DATA(cb->nlh);
  
@@ -60,7 +59,7 @@
  
  		entry.family = tw->tw_family;
  #if defined(CONFIG_IPV6) || defined (CONFIG_IPV6_MODULE)
-@@ -553,7 +556,7 @@ static int inet_twsk_diag_dump(struct inet_timewait_sock *tw,
+@@ -553,7 +557,7 @@ static int inet_twsk_diag_dump(struct inet_timewait_sock *tw,
  		entry.dport = ntohs(tw->tw_dport);
  		entry.userlocks = 0;
  
@@ -69,7 +68,7 @@
  			return 0;
  	}
  
-@@ -623,7 +626,7 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
+@@ -623,7 +627,7 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
  	struct inet_diag_req *r = NLMSG_DATA(cb->nlh);
  	struct inet_connection_sock *icsk = inet_csk(sk);
  	struct listen_sock *lopt;
@@ -78,7 +77,7 @@
  	struct inet_sock *inet = inet_sk(sk);
  	int j, s_j;
  	int reqnum, s_reqnum;
-@@ -643,8 +646,9 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
+@@ -643,8 +647,9 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
  	if (!lopt || !lopt->qlen)
  		goto out;
  
@@ -90,7 +89,7 @@
  		entry.sport = inet->num;
  		entry.userlocks = sk->sk_userlocks;
  	}
-@@ -677,8 +681,8 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
+@@ -677,8 +682,8 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
  					&ireq->rmt_addr;
  				entry.dport = ntohs(ireq->rmt_port);