Revert "fib_rules: return 0 directly if an exactly same rule exists w…

…hen NLM_F_EXCL not supplied" This reverts commit e9919a2. 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: e9919a2 ("fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied") Reported-by: Nathan Chancellor <[email protected]> Reported-by: Yaro Slav <[email protected]> Reported-by: Maciej Żenczykowski <[email protected]> Signed-off-by: Hangbin Liu <[email protected]> Reviewed-by: Nathan Chancellor <[email protected]> Tested-by: Nathan Chancellor <[email protected]> Signed-off-by: David S. Miller <[email protected]>
vieko · Jun 6, 2019 · 4970b42 · 4970b42
1 parent 930b9a0
commit 4970b42
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/net/core/fib_rules.c b/net/core/fib_rules.c
@@ -757,9 +757,9 @@ 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)
-			err = -EEXIST;
+	if ((nlh->nlmsg_flags & NLM_F_EXCL) &&
+	    rule_exists(ops, frh, tb, rule)) {
+		err = -EEXIST;
 		goto errout_free;
 	}