]> git.karo-electronics.de Git - karo-tx-linux.git/commit
[PATCH] {ip, nf}_nat_proto_gre: do not modify/corrupt GREv0 packets through NAT
authorJorge Boncompte <jorge@dti2.net>
Thu, 3 May 2007 01:14:27 +0000 (03:14 +0200)
committerChris Wright <chrisw@sous-sol.org>
Mon, 11 Jun 2007 18:37:09 +0000 (11:37 -0700)
commit26bba2674d09ceccc41bc34c4831fdaaa2ba5f66
tree4ed93eefab7d9ba347eff02ec50d60abe726b6d6
parent90ac7887638743b9d204d22fcef8c7db5e2f55a0
[PATCH] {ip, nf}_nat_proto_gre: do not modify/corrupt GREv0 packets through NAT

While porting some changes of the 2.6.21-rc7 pptp/proto_gre conntrack
and nat modules to a 2.4.32 kernel I noticed that the gre_key function
returns a wrong pointer to the GRE key of a version 0 packet thus
corrupting the packet payload.

The intended behaviour for GREv0 packets is to act like
nf_conntrack_proto_generic/nf_nat_proto_unknown so I have ripped the
offending functions (not used anymore) and modified the
nf_nat_proto_gre modules to not touch version 0 (non PPTP) packets.

Signed-off-by: Jorge Boncompte <jorge@dti2.net>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: Chris Wright <chrisw@sous-sol.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
include/linux/netfilter/nf_conntrack_proto_gre.h
include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
net/ipv4/netfilter/ip_nat_proto_gre.c
net/ipv4/netfilter/nf_nat_proto_gre.c