linux-stable.git/net/ipv4, branch v3.1.8

ipv4: using prefetch requires including prefetch.h

2012-01-06T22:17:31+00:00

[ Upstream commit b9eda06f80b0db61a73bd87c6b0eb67d8aca55ad ]

Signed-off-by: Stephen Rothwell 
Acked-by: Eric Dumazet 
Acked-by: David Miller 
Signed-off-by: Linus Torvalds 
Signed-off-by: Greg Kroah-Hartman

ipv4: reintroduce route cache garbage collector

2012-01-06T22:17:31+00:00

[ Upstream commit 9f28a2fc0bd77511f649c0a788c7bf9a5fd04edb ]

Commit 2c8cec5c10b (ipv4: Cache learned PMTU information in inetpeer)
removed IP route cache garbage collector a bit too soon, as this gc was
responsible for expired routes cleanup, releasing their neighbour
reference.

As pointed out by Robert Gladewitz, recent kernels can fill and exhaust
their neighbour cache.

Reintroduce the garbage collection, since we'll have to wait our
neighbour lookups become refcount-less to not depend on this stuff.

Reported-by: Robert Gladewitz 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

net: introduce DST_NOPEER dst flag

2012-01-06T22:17:31+00:00

[ Upstream commit e688a604807647c9450f9c12a7cb6d027150a895 ]

Chris Boot reported crashes occurring in ipv6_select_ident().

[  461.457562] RIP: 0010:[]  []
ipv6_select_ident+0x31/0xa7

[  461.578229] Call Trace:
[  461.580742] 
[  461.582870]  [] ? udp6_ufo_fragment+0x124/0x1a2
[  461.589054]  [] ? ipv6_gso_segment+0xc0/0x155
[  461.595140]  [] ? skb_gso_segment+0x208/0x28b
[  461.601198]  [] ? ipv6_confirm+0x146/0x15e
[nf_conntrack_ipv6]
[  461.608786]  [] ? nf_iterate+0x41/0x77
[  461.614227]  [] ? dev_hard_start_xmit+0x357/0x543
[  461.620659]  [] ? nf_hook_slow+0x73/0x111
[  461.626440]  [] ? br_parse_ip_options+0x19a/0x19a
[bridge]
[  461.633581]  [] ? dev_queue_xmit+0x3af/0x459
[  461.639577]  [] ? br_dev_queue_push_xmit+0x72/0x76
[bridge]
[  461.646887]  [] ? br_nf_post_routing+0x17d/0x18f
[bridge]
[  461.653997]  [] ? nf_iterate+0x41/0x77
[  461.659473]  [] ? br_flood+0xfa/0xfa [bridge]
[  461.665485]  [] ? nf_hook_slow+0x73/0x111
[  461.671234]  [] ? br_flood+0xfa/0xfa [bridge]
[  461.677299]  [] ?
nf_bridge_update_protocol+0x20/0x20 [bridge]
[  461.684891]  [] ? nf_ct_zone+0xa/0x17 [nf_conntrack]
[  461.691520]  [] ? br_flood+0xfa/0xfa [bridge]
[  461.697572]  [] ? NF_HOOK.constprop.8+0x3c/0x56
[bridge]
[  461.704616]  [] ?
nf_bridge_push_encap_header+0x1c/0x26 [bridge]
[  461.712329]  [] ? br_nf_forward_finish+0x8a/0x95
[bridge]
[  461.719490]  [] ?
nf_bridge_pull_encap_header+0x1c/0x27 [bridge]
[  461.727223]  [] ? br_nf_forward_ip+0x1c0/0x1d4 [bridge]
[  461.734292]  [] ? nf_iterate+0x41/0x77
[  461.739758]  [] ? __br_deliver+0xa0/0xa0 [bridge]
[  461.746203]  [] ? nf_hook_slow+0x73/0x111
[  461.751950]  [] ? __br_deliver+0xa0/0xa0 [bridge]
[  461.758378]  [] ? NF_HOOK.constprop.4+0x56/0x56
[bridge]

This is caused by bridge netfilter special dst_entry (fake_rtable), a
special shared entry, where attaching an inetpeer makes no sense.

Problem is present since commit 87c48fa3b46 (ipv6: make fragment
identifications less predictable)

Introduce DST_NOPEER dst flag and make sure ipv6_select_ident() and
__ip_select_ident() fallback to the 'no peer attached' handling.

Reported-by: Chris Boot 
Tested-by: Chris Boot 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

ipv4: flush route cache after change accept_local

2012-01-06T22:17:29+00:00

[ Upstream commit d01ff0a049f749e0bf10a35bb23edd012718c8c2 ]

After reset ipv4_devconf->data[IPV4_DEVCONF_ACCEPT_LOCAL] to 0,
we should flush route cache, or it will continue receive packets with local
source address, which should be dropped.

Signed-off-by: Weiping Pan 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

net: have ipconfig not wait if no dev is available

2012-01-06T22:17:27+00:00

[ Upstream commit cd7816d14953c8af910af5bb92f488b0b277e29d ]

previous commit 3fb72f1e6e6165c5f495e8dc11c5bbd14c73385c
makes IP-Config wait for carrier on at least one network device.

Before waiting (predefined value 120s), check that at least one device
was successfully brought up. Otherwise (e.g. buggy bootloader
which does not set the MAC address) there is no point in waiting
for carrier.

Cc: Micha Nelissen 
Cc: Holger Brunck 
Signed-off-by: Gerlando Falauto 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

ipip, sit: copy parms.name after register_netdevice

2012-01-06T22:16:49+00:00

commit 72b36015ba43a3cca5303f5534d2c3e1899eae29 upstream.

Same fix as 731abb9cb2 for ipip and sit tunnel.
Commit 1c5cae815d removed an explicit call to dev_alloc_name in
ipip_tunnel_locate and ipip6_tunnel_locate, because register_netdevice
will now create a valid name, however the tunnel keeps a copy of the
name in the private parms structure. Fix this by copying the name back
after register_netdevice has successfully returned.

This shows up if you do a simple tunnel add, followed by a tunnel show:

$ sudo ip tunnel add mode ipip remote 10.2.20.211
$ ip tunnel
tunl0: ip/ip  remote any  local any  ttl inherit  nopmtudisc
tunl%d: ip/ip  remote 10.2.20.211  local any  ttl inherit
$ sudo ip tunnel add mode sit remote 10.2.20.212
$ ip tunnel
sit0: ipv6/ip  remote any  local any  ttl 64  nopmtudisc 6rd-prefix 2002::/16
sit%d: ioctl 89f8 failed: No such device
sit%d: ipv6/ip  remote 10.2.20.212  local any  ttl inherit

Signed-off-by: Ted Feng 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

ipv4: make sure RTO_ONLINK is saved in routing cache

2011-12-09T16:56:08+00:00

[ Upstream commit f61759e6b831a55b89e584b198c3da325e2bc379 ]

__mkroute_output fails to work with the original tos
and uses value with stripped RTO_ONLINK bit. Make sure we put
the original TOS bits into rt_key_tos because it used to match
cached route.

Signed-off-by: Julian Anastasov 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

ipv4: Perform peer validation on cached route lookup.

2011-12-09T16:56:07+00:00

[ Upstream commit efbc368dcc6426d5430b9b8eeda944cf2cb74b8c,
  incorporating a follow-on change to prevent an OOPS ]

Otherwise we won't notice the peer GENID change.

Reported-by: Steffen Klassert 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

inet: add a redirect generation id in inetpeer

2011-12-09T16:56:07+00:00

[ Upstream commit de68dca1816660b0d3ac89fa59ffb410007a143f ]

Now inetpeer is the place where we cache redirect information for ipv4
destinations, we must be able to invalidate informations when a route is
added/removed on host.

As inetpeer is not yet namespace aware, this patch adds a shared
redirect_genid, and a per inetpeer redirect_genid. This might be changed
later if inetpeer becomes ns aware.

Cache information for one inerpeer is valid as long as its
redirect_genid has the same value than global redirect_genid.

Reported-by: Arkadiusz Miśkiewicz 
Tested-by: Arkadiusz Miśkiewicz 
Signed-off-by: Eric Dumazet 
Signed-off-by: David S. Miller 
Signed-off-by: Greg Kroah-Hartman

ipv4: fix redirect handling

2011-12-09T16:56:06+00:00

[ Upstream commit 9cc20b268a5a14f5e57b8ad405a83513ab0d78dc ]

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 
Signed-off-by: Greg Kroah-Hartman