From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,T_DKIMWL_WL_HIGH,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3BC36C28EBD for ; Sun, 9 Jun 2019 16:54:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 15FE0207E0 for ; Sun, 9 Jun 2019 16:54:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099273; bh=wYee2MizF4FGI303blNlFR0jzsgsGPDXdDm4XMppkpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=xit60bgoBvQyE65Sm/D2adgt/8Gb9AqEb9RHFupPMvoqwcA2Rh+zOqOuqucD1My+4 tSZ+0dYo5mYS2tHfIHgbZNuuhllpvOb18HxzjSYMJ3oVNWbku/O+fCZzP7TVHyJXSo Q3siFoileHkCWhbJtQvKc0GJ4OWPt+Xk4o85+Q5Y= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732621AbfFIQyc (ORCPT ); Sun, 9 Jun 2019 12:54:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:56132 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732596AbfFIQy2 (ORCPT ); Sun, 9 Jun 2019 12:54:28 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0A9AB204EC; Sun, 9 Jun 2019 16:54:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1560099267; bh=wYee2MizF4FGI303blNlFR0jzsgsGPDXdDm4XMppkpM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Tt4DGf7+qQVBIxw155z+af28Z+iXXElypRG9FISDse9aWyFDWS28GvgDQVfXj1a2x BuZJmHn8Im+KZcciKb+Bu+f92NzVYn1hMH56QfQnAZyUlYY37AeZ20wPu699YxttD+ 6pMxyBNgkV/tY+PfTpj/lrfE5Guks+dcJZ7F7Z5E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nathan Chancellor , Yaro Slav , =?UTF-8?q?Maciej=20=C5=BBenczykowski?= , Hangbin Liu , "David S. Miller" Subject: [PATCH 4.9 70/83] Revert "fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied" Date: Sun, 9 Jun 2019 18:42:40 +0200 Message-Id: <20190609164133.781456697@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190609164127.843327870@linuxfoundation.org> References: <20190609164127.843327870@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Hangbin Liu [ Upstream commit 4970b42d5c362bf873982db7d93245c5281e58f4 ] This reverts commit e9919a24d3022f72bcadc407e73a6ef17093a849. 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: e9919a24d302 ("fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied") Reported-by: Nathan Chancellor Reported-by: Yaro Slav Reported-by: Maciej Żenczykowski Signed-off-by: Hangbin Liu Reviewed-by: Nathan Chancellor Tested-by: Nathan Chancellor Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/fib_rules.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -429,9 +429,9 @@ int fib_nl_newrule(struct sk_buff *skb, if (rule->l3mdev && rule->table) goto errout_free; - 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; }