aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorJulian Anastasov <ja@ssi.bg>2017-02-26 10:14:35 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-03-22 07:43:32 -0400
commit36931eb015ee44fe2c8f220b46500b25f7282442 (patch)
tree87fbc65609c76284ee0c2df6c651e22cfe9a6399 /net
parenta64407fafe09ca33b09aabd49c5d526b1b6b7528 (diff)
ipv4: mask tos for input route
[ Upstream commit 6e28099d38c0e50d62c1afc054e37e573adf3d21 ] Restore the lost masking of TOS in input route code to allow ip rules to match it properly. Problem [1] noticed by Shmulik Ladkani <shmulik.ladkani@gmail.com> [1] http://marc.info/?t=137331755300040&r=1&w=2 Fixes: 89aef8921bfb ("ipv4: Delete routing cache.") Signed-off-by: Julian Anastasov <ja@ssi.bg> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net')
-rw-r--r--net/ipv4/route.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index d851cae27dac..17e6fbf30448 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -1968,6 +1968,7 @@ int ip_route_input_noref(struct sk_buff *skb, __be32 daddr, __be32 saddr,
1968{ 1968{
1969 int res; 1969 int res;
1970 1970
1971 tos &= IPTOS_RT_MASK;
1971 rcu_read_lock(); 1972 rcu_read_lock();
1972 1973
1973 /* Multicast recognition logic is moved from route cache to here. 1974 /* Multicast recognition logic is moved from route cache to here.