linux.git/net/ipv4, branch v3.2-rc4

ipv4: fix redirect handling

2011-11-18T20:24:32+00:00

commit f39925dbde77 (ipv4: Cache learned redirect information in
inetpeer.) introduced a regression in ICMP redirect handling.

It assumed ipv4_dst_check() would be called because all possible routes
were attached to the inetpeer we modify in ip_rt_redirect(), but thats
not true.

commit 7cc9150ebe (route: fix ICMP redirect validation) tried to fix
this but solution was not complete. (It fixed only one route)

So we must lookup existing routes (including different TOS values) and
call check_peer_redir() on them.

Reported-by: Ivan Zahariev 
Signed-off-by: Eric Dumazet 
CC: Flavio Leitner 
Signed-off-by: David S. Miller

ping: dont increment ICMP_MIB_INERRORS

2011-11-18T19:38:59+00:00

ping module incorrectly increments ICMP_MIB_INERRORS if feeded with a
frame not belonging to its own sockets.

RFC 2011 states that ICMP_MIB_INERRORS should count "the number of ICMP
messages which the entiry received but determined as having
ICMP-specific errors (bad ICMP checksums, bad length, etc.)."

Signed-off-by: Eric Dumazet 
CC: Vasiliy Kulikov 
Acked-by: Flavio Leitner 
Acked-by: Vasiliy Kulikov 
Signed-off-by: David S. Miller

tcp: clear xmit timers in tcp_v4_syn_recv_sock()

2011-11-16T21:57:45+00:00

Simon Kirby reported divides by zero errors in __tcp_select_window()

This happens when inet_csk_route_child_sock() returns a NULL pointer :

We free new socket while we eventually armed keepalive timer in
tcp_create_openreq_child()

Fix this by a call to tcp_clear_xmit_timers()

[ This is a followup to commit 918eb39962dff (net: add missing
bh_unlock_sock() calls) ]

Reported-by: Simon Kirby 
Signed-off-by: Eric Dumazet 
Tested-by: Simon Kirby 
Signed-off-by: David S. Miller

net-netlink: Add a new attribute to expose TCLASS values via netlink

2011-11-14T06:08:49+00:00

commit 3ceca749668a52bd795585e0f71c6f0b04814f7b added a TOS attribute.

Unfortunately TOS and TCLASS are both present in a dual-stack v6 socket,
furthermore they can have different values.  As such one cannot in a
sane way expose both through a single attribute.

Signed-off-by: Maciej Żenczyowski 
CC: Murali Raja 
CC: Stephen Hemminger 
CC: Eric Dumazet 
CC: David S. Miller 
Signed-off-by: David S. Miller

ah: Don't return NET_XMIT_DROP on input.

2011-11-12T23:13:32+00:00

When the ahash driver returns -EBUSY, AH4/6 input functions return
NET_XMIT_DROP, presumably copied from the output code path.  But
returning transmit codes on input doesn't make a lot of sense.
Since NET_XMIT_DROP is a positive int, this gets interpreted as
the next header type (i.e., success).  As that can only end badly,
remove the check.

Signed-off-by: Nick Bowler 
Signed-off-by: David S. Miller

ipv4: fix for ip_options_rcv_srr() daddr update.

2011-11-09T20:59:00+00:00

When opt->srr_is_hit is set skb_rtable(skb) has been updated for
'nexthop' and iph->daddr should always equals to skb_rtable->rt_dst
holds, We need update iph->daddr either.

Signed-off-by: Li Wei 
Signed-off-by: David S. Miller

ah: Read nexthdr value before overwriting it in ahash input callback.

2011-11-09T20:55:53+00:00

The AH4/6 ahash input callbacks read out the nexthdr field from the AH
header *after* they overwrite that header.  This is obviously not going
to end well.  Fix it up.

Signed-off-by: Nick Bowler 
Signed-off-by: David S. Miller

ah: Correctly pass error codes in ahash output callback.

2011-11-09T20:55:53+00:00

The AH4/6 ahash output callbacks pass nexthdr to xfrm_output_resume
instead of the error code.  This appears to be a copy+paste error from
the input case, where nexthdr is expected.  This causes the driver to
continuously add AH headers to the datagram until either an allocation
fails and the packet is dropped or the ahash driver hits a synchronous
fallback and the resulting monstrosity is transmitted.

Correct this issue by simply passing the error code unadulterated.

Signed-off-by: Nick Bowler 
Signed-off-by: David S. Miller

ipv4: Fix inetpeer expire time information

2011-11-08T19:40:40+00:00

As we update the learned pmtu informations on demand, we might
report a nagative expiration time value to userspace if the
pmtu informations are already expired and we have not send a
packet to that inetpeer after expiration. With this patch we
send a expire time of null to userspace after expiration
until the next packet is send to that inetpeer.

Signed-off-by: Steffen Klassert 
Signed-off-by: David S. Miller

tcp: Fix comments for Nagle algorithm

2011-11-08T19:02:47+00:00

TCP_NODELAY is weaker than TCP_CORK, when TCP_CORK was set, small
segments will always pass Nagle test regardless of TCP_NODELAY option.

Signed-off-by: Feng King 
Signed-off-by: David S. Miller