linux.git/net/ipv4, branch v2.6.20

[NETFILTER]: ctnetlink: fix compile failure with NF_CONNTRACK_MARK=n

2007-02-03T03:33:11+00:00

  CC      net/netfilter/nf_conntrack_netlink.o
net/netfilter/nf_conntrack_netlink.c: In function 'ctnetlink_conntrack_event':
net/netfilter/nf_conntrack_netlink.c:392: error: 'struct nf_conn' has no member named 'mark'
make[3]: *** [net/netfilter/nf_conntrack_netlink.o] Error 1

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: SIP conntrack: fix out of bounds memory access

2007-01-30T22:25:24+00:00

When checking for an @-sign in skp_epaddr_len, make sure not to
run over the packet boundaries.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: SIP conntrack: fix skipping over user info in SIP headers

2007-01-30T22:24:57+00:00

When trying to skip over the username in the Contact header, stop at the
end of the line if no @ is found to avoid mangling following headers.
We don't need to worry about continuation lines because we search inside
a SIP URI.

Fixes Netfilter Bugzilla #532.

Signed-off-by: Lars Immisch 
Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[IPV4]: Fix single-entry /proc/net/fib_trie output.

2007-01-27T03:06:01+00:00

 
When main table is just a single leaf this gets printed as belonging to the 
local table in /proc/net/fib_trie. A fix is below.

Signed-off-by: Robert Olsson 
Acked-by: Eric W. Biederman 
Signed-off-by: David S. Miller

[NETFILTER]: nf_nat_pptp: fix expectation removal

2007-01-26T09:07:30+00:00

When removing the expectation for the opposite direction, the PPTP NAT
helper initializes the tuple for lookup with the addresses of the
opposite direction, which makes the lookup fail.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[NETFILTER]: nf_nat: fix ICMP translation with statically linked conntrack

2007-01-26T09:06:47+00:00

When nf_nat/nf_conntrack_ipv4 are linked statically, nf_nat is initialized
before nf_conntrack_ipv4, which makes the nf_ct_l3proto_find_get(AF_INET)
call during nf_nat initialization return the generic l3proto instead of
the AF_INET specific one. This breaks ICMP error translation since the
generic protocol always initializes the IPs in the tuple to 0.

Change the linking order and put nf_conntrack_ipv4 first.

Signed-off-by: Patrick McHardy 
Signed-off-by: David S. Miller

[TCP]: Restore SKB socket owner setting in tcp_transmit_skb().

2007-01-26T09:04:55+00:00

Revert 931731123a103cfb3f70ac4b7abfc71d94ba1f03

We can't elide the skb_set_owner_w() here because things like certain
netfilter targets (such as owner MATCH) need a socket to be set on the
SKB for correct operation.

Thanks to Jan Engelhardt and other netfilter list members for
pointing this out.

Signed-off-by: David S. Miller

[TCP]: Fix sorting of SACK blocks.

2007-01-25T21:35:06+00:00

The sorting of SACK blocks actually munges them rather than sort,
causing the TCP stack to ignore some SACK information and breaking the
assumption of ordered SACK blocks after sorting.

The sort takes the data from a second buffer which isn't moved causing
subsequent data moves to occur from the wrong location. The fix is to
use a temporary buffer as a normal sort does.

Signed-off-By: Baruch Even 
Signed-off-by: David S. Miller

[IPV4]: Fix the fib trie iterator to work with a single entry routing tables

2007-01-24T22:42:04+00:00

In a kernel with trie routing enabled I had a simple routing setup
with only a single route to the outside world and no default
route. "ip route table list main" showed my the route just fine but
/proc/net/route was an empty file.  What was going on?

Thinking it was a bug in something I did and I looked deeper.  Eventually
I setup a second route and everything looked correct, huh?  Finally I
realized that the it was just the iterator pair in fib_trie_get_first,
fib_trie_get_next just could not handle a routing table with a single entry.

So to save myself and others further confusion, here is a simple fix for
the fib proc iterator so it works even when there is only a single route
in a routing table.

Signed-off-by: Eric W. Biederman 
Signed-off-by: Robert Olsson 
Signed-off-by: David S. Miller

[TCP]: rare bad TCP checksum with 2.6.19

2007-01-24T06:07:12+00:00

The patch "Replace CHECKSUM_HW by CHECKSUM_PARTIAL/CHECKSUM_COMPLETE"
changed to unconditional copying of ip_summed field from collapsed
skb. This patch reverts this change.

The majority of substantial work including heavy testing
and diagnosing by: Michael Tokarev 
Possible reasons pointed by: Herbert Xu and Patrick McHardy.

Signed-off-by: Jarek Poplawski 
Acked-by: Herbert Xu 
Signed-off-by: David S. Miller