[064/114] act_nat: the checksum of ICMP doesnt have pseudo header

Previous thread: [049/114] dm snapshot: test chunk size against both origin and snapshot by Greg KH on Tuesday, August 24, 2010 - 3:44 pm. (1 message)

Next thread: [063/114] bridge: Fix skb leak when multicast parsing fails on TX by Greg KH on Tuesday, August 24, 2010 - 3:45 pm. (1 message)
From: Greg KH
Date: Tuesday, August 24, 2010 - 3:45 pm

2.6.35-stable review patch.  If anyone has any objections, please let us know.

------------------


From: Changli Gao <xiaosuo@gmail.com>

[ Upstream commit 3a3dfb062c2e086c202d34f09ce29634515ad256 ]

after updating the value of the ICMP payload, inet_proto_csum_replace4() should
be called with zero pseudohdr.

Signed-off-by: Changli Gao <xiaosuo@gmail.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 net/sched/act_nat.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/sched/act_nat.c
+++ b/net/sched/act_nat.c
@@ -246,7 +246,7 @@ static int tcf_nat(struct sk_buff *skb,
 			iph->saddr = new_addr;
 
 		inet_proto_csum_replace4(&icmph->checksum, skb, addr, new_addr,
-					 1);
+					 0);
 		break;
 	}
 	default:


--

Previous thread: [049/114] dm snapshot: test chunk size against both origin and snapshot by Greg KH on Tuesday, August 24, 2010 - 3:44 pm. (1 message)

Next thread: [063/114] bridge: Fix skb leak when multicast parsing fails on TX by Greg KH on Tuesday, August 24, 2010 - 3:45 pm. (1 message)