Commit 4970b42d authored Jun 05, 2019 by Hangbin Liu Committed by David S. Miller Jun 05, 2019

Revert "fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied"



This reverts commit e9919a24.

Nathan reported the new behaviour breaks Android, as Android just add
new rules and delete old ones.

If we return 0 without adding dup rules, Android will remove the new
added rules and causing system to soft-reboot.

Fixes: e9919a24 ("fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied")
Reported-by: Nathan Chancellor <natechancellor@gmail.com>
Reported-by: Yaro Slav <yaro330@gmail.com>
Reported-by: Maciej Żenczykowski <zenczykowski@gmail.com>
Signed-off-by: Hangbin Liu <liuhangbin@gmail.com>
Reviewed-by: Nathan Chancellor <natechancellor@gmail.com>
Tested-by: Nathan Chancellor <natechancellor@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 930b9a05

net/core/fib_rules.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -757,8 +757,8 @@ int fib_nl_newrule(struct sk_buff skb, struct nlmsghdr nlh,
		if (err)
		goto errout;

		if (rule_exists(ops, frh, tb, rule)) {
		if (nlh->nlmsg_flags & NLM_F_EXCL)
		if ((nlh->nlmsg_flags & NLM_F_EXCL) &&
		rule_exists(ops, frh, tb, rule)) {
		err = -EEXIST;
		goto errout_free;
		}