Revert "ipv4: Allow configuring subnets as local addresses"
Subsystems (3)
David Miller
maintainerPATCH 1/1 Revert "ipv4: Allow configuring subnets as local addresses"
This reverts commit 4465b469008bc03b98a1b8df4e9ae501b6c69d4b.
Conflicts:
net/ipv4/fib_frontend.c
As reported by Ben Greear, this causes regressions:
Quoted 15 lines
Change
4465b469008bc03b98a1b8df4e9ae501b6c69d4bcaused rules to stop matching the input device properly because theFLOWI_FLAG_MATCH_ANY_IIFis always defined inip_dev_find().This breaks rules such as:
ip rule add pref 512 lookup local
ip rule del pref 0 lookup local
ip link set eth2 up
ip -4 addr add 172.16.0.102/24 broadcast 172.16.0.255 dev eth2 ip rule add to 172.16.0.102 iif eth2 lookup local pref 10 ip rule add iif eth2 lookup 10001 pref 20
ip route add 172.16.0.0/24 dev eth2 table 10001
ip route add unreachable 0/0 table 10001
Quoted 5 lines
If you had a second interface 'eth0' that was on a different subnet, pinging a system on that interface would fail:
[root@ct503-60 ~]# ping 192.168.100.1
connect: Invalid argument
---
I'm posting this because there were non-trivial merge conflicts with Eric Dumazet's RCU work.
include/net/flow.h | 1 - net/core/fib_rules.c | 3 +-- net/ipv4/fib_frontend.c | 10 ++++++++-- 3 files changed, 9 insertions(+), 5 deletions(-)
include/net/flow.h +0 -1
@@ -49,7 +49,6 @@ struct flowi {__u8 proto;__u8 flags;#define FLOWI_FLAG_ANYSRC 0x01 -#define FLOWI_FLAG_MATCH_ANY_IIF 0x02 union { struct { __be16 sport;
net/core/fib_rules.c +1 -2
@@ -181,8 +181,7 @@ static int fib_rule_match(struct fib_rule *rule, struct fib_rules_ops *ops, {int ret =0 ; -if (rule->iifindex && (rule->iifindex != fl->iif) && - !(fl->flags &FLOWI_FLAG_MATCH_ANY_IIF )) +if (rule->iifindex && (rule->iifindex != fl->iif)) goto out;if (rule->oifindex && (rule->oifindex != fl->oif))
net/ipv4/fib_frontend.c +8 -2
@@ -163,13 +163,19 @@ struct net_device *__ip_dev_find(struct net *net, __be32 addr, bool devref) .daddr = addr } }, - .flags = FLOWI_FLAG_MATCH_ANY_IIF };struct fib_result res = {0 };struct net_device *dev =NULL ; +struct fib_table *local_table; + +#ifdef CONFIG_IP_MULTIPLE_TABLES + res.r =NULL ; +#endif rcu_read_lock (); -if (fib_lookup (net, &fl, &res)) { + local_table =fib_get_table (net,RT_TABLE_LOCAL ); +if (!local_table || +fib_table_lookup (local_table, &fl, &res,FIB_LOOKUP_NOREF )) {rcu_read_unlock ();return NULL ; }
Signature · 1 line
1.7.3.4