Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d547f727df86059104af2234804fdd538e112015

Authored by Julian Anastasov
Committed by David S. Miller
1 parent 025890b4ed
Exists in master and in 6 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

ipv4: fix the reusing of routing cache entries 

compare_keys and ip_route_input_common rely on
rt_oif for distinguishing of input and output routes
with same keys values. But sometimes the input route has
also same hash chain (keyed by iif != 0) with the output
routes (keyed by orig_oif=0). Problem visible if running
with small number of rhash_entries.

	Fix them to use rt_route_iif instead. By this way
input route can not be returned to users that request
output route.

	The patch fixes the ip_rt_bug errors that were
reported in ip_local_out context, mostly for 255.255.255.255
destinations.

Signed-off-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>

Showing 1 changed file with 2 additions and 1 deletions Side-by-side Diff

... ... @@ -731,6 +731,7 @@
731 731 ((__force u32)rt1->rt_key_src ^ (__force u32)rt2->rt_key_src) |
732 732 (rt1->rt_mark ^ rt2->rt_mark) |
733 733 (rt1->rt_key_tos ^ rt2->rt_key_tos) |
  734 + (rt1->rt_route_iif ^ rt2->rt_route_iif) |
734 735 (rt1->rt_oif ^ rt2->rt_oif) |
735 736 (rt1->rt_iif ^ rt2->rt_iif)) == 0;
736 737 }
737 738  
... ... @@ -2321,8 +2322,8 @@
2321 2322 if ((((__force u32)rth->rt_key_dst ^ (__force u32)daddr) |
2322 2323 ((__force u32)rth->rt_key_src ^ (__force u32)saddr) |
2323 2324 (rth->rt_iif ^ iif) |
2324   - rth->rt_oif |
2325 2325 (rth->rt_key_tos ^ tos)) == 0 &&
  2326 + rt_is_input_route(rth) &&
2326 2327 rth->rt_mark == skb->mark &&
2327 2328 net_eq(dev_net(rth->dst.dev), net) &&
2328 2329 !rt_is_expired(rth)) {