public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Greg Kroah-Hartman <gregkh@suse.de>
To: linux-kernel@vger.kernel.org, stable@kernel.org
Cc: Justin Forbes <jmforbes@linuxtx.org>,
	Zwane Mwaikambo <zwane@arm.linux.org.uk>,
	"Theodore Ts'o" <tytso@mit.edu>,
	Randy Dunlap <rdunlap@xenotime.net>,
	Dave Jones <davej@redhat.com>,
	Chuck Wolber <chuckw@quantumlinux.com>,
	torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk,
	davem@davemloft.net, herbert@gondor.apana.org.au
Subject: [patch 07/19] [GRE]: Fix hardware checksum modification
Date: Fri, 23 Dec 2005 14:48:02 -0800	[thread overview]
Message-ID: <20051223224802.GG19057@kroah.com> (raw)
In-Reply-To: <20051223224712.GA18975@kroah.com>

[-- Attachment #1: gre-fix-hardware-checksum-modification.patch --]
[-- Type: text/plain, Size: 1054 bytes --]

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

------------------
From: Herbert Xu <herbert@gondor.apana.org.au>

The skb_postpull_rcsum introduced a bug to the checksum modification.
Although the length pulled is offset bytes, the origin of the pulling
is the GRE header, not the IP header.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Chris Wright <chrisw@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---
 net/ipv4/ip_gre.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- linux-2.6.14.4.orig/net/ipv4/ip_gre.c
+++ linux-2.6.14.4/net/ipv4/ip_gre.c
@@ -617,7 +617,7 @@ static int ipgre_rcv(struct sk_buff *skb
 
 		skb->mac.raw = skb->nh.raw;
 		skb->nh.raw = __pskb_pull(skb, offset);
-		skb_postpull_rcsum(skb, skb->mac.raw, offset);
+		skb_postpull_rcsum(skb, skb->h.raw, offset);
 		memset(&(IPCB(skb)->opt), 0, sizeof(struct ip_options));
 		skb->pkt_type = PACKET_HOST;
 #ifdef CONFIG_NET_IPGRE_BROADCAST

--

  parent reply	other threads:[~2005-12-23 22:54 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20051223221200.342826000@press.kroah.org>
2005-12-23 22:47 ` [patch 00/19] -stable review for 2.6.14.5 Greg Kroah-Hartman
2005-12-23 22:47   ` [patch 01/19] ACPI: Add support for FADT P_LVL2_UP flag Greg Kroah-Hartman
2005-12-24 15:38     ` Pavel Machek
2005-12-24 16:14     ` Daniel Drake
2005-12-26 23:54       ` Greg KH
2005-12-23 22:47   ` [patch 02/19] ACPI: Prefer _CST over FADT for C-state capabilities Greg Kroah-Hartman
2005-12-23 22:47   ` [patch 03/19] [NETFILTER]: Fix CTA_PROTO_NUM attribute size in ctnetlink Greg Kroah-Hartman
2005-12-23 22:47   ` [patch 04/19] [NETFILTER]: Fix unbalanced read_unlock_bh " Greg Kroah-Hartman
2005-12-23 22:47   ` [patch 05/19] apci: fix NULL deref in video/lcd/brightness Greg Kroah-Hartman
2005-12-23 22:47   ` [patch 06/19] [PATCH] dpt_i2o fix for deadlock condition Greg Kroah-Hartman
2005-12-23 22:48   ` Greg Kroah-Hartman [this message]
2005-12-23 22:48   ` [patch 08/19] [VLAN]: Fix hardware rx csum errors Greg Kroah-Hartman
2005-12-23 22:48   ` [patch 09/19] [NETFILTER]: Fix NAT init order Greg Kroah-Hartman
2005-12-23 22:48   ` [patch 10/19] [NETFILTER]: Fix incorrect dependency for IP6_NF_TARGET_NFQUEUE Greg Kroah-Hartman
2005-12-23 22:48   ` [patch 11/19] [RTNETLINK]: Fix RTNLGRP definitions in rtnetlink.h Greg Kroah-Hartman
2005-12-23 22:48   ` [patch 12/19] [BRIDGE-NF]: Fix bridge-nf ipv6 length check Greg Kroah-Hartman
2005-12-23 22:48   ` [patch 13/19] [IPV6]: Fix route lifetime Greg Kroah-Hartman
2005-12-23 22:48   ` [patch 14/19] [IPSEC]: Perform SA switchover immediately Greg Kroah-Hartman
2005-12-23 22:48   ` [patch 15/19] [PATCH] Input: fix an OOPS in HID driver Greg Kroah-Hartman
2005-12-23 22:48   ` [patch 16/19] kernel/params.c: fix sysfs access with CONFIG_MODULES=n Greg Kroah-Hartman
2005-12-23 22:48   ` [patch 17/19] SCSI: fix transfer direction in sd (kernel panic when ejecting iPod) Greg Kroah-Hartman
2005-12-23 22:48   ` [patch 18/19] SCSI: fix transfer direction in scsi_lib and st Greg Kroah-Hartman
2005-12-23 23:05     ` James Bottomley
2005-12-23 23:22       ` [stable] " Chris Wright
2005-12-23 22:48   ` [patch 19/19] setting ACLs on readonly mounted NFS filesystems (CVE-2005-3623) Greg Kroah-Hartman

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20051223224802.GG19057@kroah.com \
    --to=gregkh@suse.de \
    --cc=akpm@osdl.org \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=chuckw@quantumlinux.com \
    --cc=davej@redhat.com \
    --cc=davem@davemloft.net \
    --cc=herbert@gondor.apana.org.au \
    --cc=jmforbes@linuxtx.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=rdunlap@xenotime.net \
    --cc=stable@kernel.org \
    --cc=torvalds@osdl.org \
    --cc=tytso@mit.edu \
    --cc=zwane@arm.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox