Revert "ipv4: Allow configuring subnets as local addresses" (e0584649) · Commits · 戴 / test

This reverts commit . Conflicts: net/ipv4/fib_frontend.c As reported by Ben Greear, this causes regressions: > Change caused rules > to stop matching the input device properly because the > FLOWI_FLAG_MATCH_ANY_IIF is always defined in ip_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 > > 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 Reported-by:

Ben Greear <greearb@candelatech.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

include/net/flow.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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

Original line number	Diff line number	Diff line
		@@ -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;
		}

Admin message