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=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 794EBC04AAC for ; Mon, 20 May 2019 12:17:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5021320815 for ; Mon, 20 May 2019 12:17:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558354653; bh=udL3M1vP8B8S3V4S/JWx04LQMK+eLIfFE9fbigQye/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Ly9YlwQY2+jQTETu+ksALMyhsHCxlMPwUttyQ0ryEK98Ldm2ZM2Q8gN3EJ4GHWruD lzSpldHCNnOyYGHMsmmfnxFXOlQ8rPaDl0a3yQu2SGOQ3Yc9C/CADikVwqZ/Jsc2X6 OjX1jHYXGkVuufSqcQLftsyzzhBs+RiOBaQYs87A= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731383AbfETMRc (ORCPT ); Mon, 20 May 2019 08:17:32 -0400 Received: from mail.kernel.org ([198.145.29.99]:58528 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387561AbfETMRb (ORCPT ); Mon, 20 May 2019 08:17:31 -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 4AED920815; Mon, 20 May 2019 12:17:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558354650; bh=udL3M1vP8B8S3V4S/JWx04LQMK+eLIfFE9fbigQye/0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sGjYFNxZXYYxYDC2Xh5KAhJ+4g6DyasTmpDU0o5eBjHfoDq9kEMXtRmzakfF3m36S GePuXYBj9a2M9A8miFNUskbhjKzDpZyDDBZ64DqeLiMKqu60gwl0fvoeMvRAVa9FYy Z+PK3Uo6sQ3nbClKLBCQvg4e0pGc/zMpmjAzoXuY= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nathan Chancellor , David Ahern , Florian Westphal , Hangbin Liu , "David S. Miller" Subject: [PATCH 4.9 38/44] fib_rules: fix error in backport of e9919a24d302 ("fib_rules: return 0...") Date: Mon, 20 May 2019 14:14:27 +0200 Message-Id: <20190520115235.482112363@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190520115230.720347034@linuxfoundation.org> References: <20190520115230.720347034@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Greg Kroah-Hartman When commit e9919a24d302 ("fib_rules: return 0 directly if an exactly same rule exists when NLM_F_EXCL not supplied") was backported to 4.9.y, it changed the logic a bit as err should have been reset before exiting the test, like it happens in the original logic. If this is not set, errors happen :( Reported-by: Nathan Chancellor Reported-by: David Ahern Reported-by: Florian Westphal Cc: Hangbin Liu Cc: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/fib_rules.c | 1 + 1 file changed, 1 insertion(+) --- a/net/core/fib_rules.c +++ b/net/core/fib_rules.c @@ -430,6 +430,7 @@ int fib_nl_newrule(struct sk_buff *skb, goto errout_free; if (rule_exists(ops, frh, tb, rule)) { + err = 0; if (nlh->nlmsg_flags & NLM_F_EXCL) err = -EEXIST; goto errout_free;