From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933541Ab0HXXOO (ORCPT ); Tue, 24 Aug 2010 19:14:14 -0400 Received: from kroah.org ([198.145.64.141]:41178 "EHLO coco.kroah.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933519Ab0HXXCr (ORCPT ); Tue, 24 Aug 2010 19:02:47 -0400 X-Mailbox-Line: From gregkh@clark.site Tue Aug 24 15:45:06 2010 Message-Id: <20100824224506.808266630@clark.site> User-Agent: quilt/0.48-11.2 Date: Tue, 24 Aug 2010 15:45:09 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: stable-review@kernel.org, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@lxorguk.ukuu.org.uk, Changli Gao , Herbert Xu , "David S. Miller" Subject: [064/114] act_nat: the checksum of ICMP doesnt have pseudo header In-Reply-To: <20100824224610.GA5424@kroah.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 2.6.35-stable review patch. If anyone has any objections, please let us know. ------------------ From: Changli Gao [ 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 Acked-by: Herbert Xu Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- 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: