From patchwork Thu Mar 22 22:57:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 889722 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=cumulusnetworks.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=cumulusnetworks.com header.i=@cumulusnetworks.com header.b="fbZM3HC7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 406htB142kz9s0x for ; Fri, 23 Mar 2018 09:58:42 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751980AbeCVW6k (ORCPT ); Thu, 22 Mar 2018 18:58:40 -0400 Received: from mail-pf0-f195.google.com ([209.85.192.195]:35273 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751872AbeCVW6R (ORCPT ); Thu, 22 Mar 2018 18:58:17 -0400 Received: by mail-pf0-f195.google.com with SMTP id y186so3980620pfb.2 for ; Thu, 22 Mar 2018 15:58:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cumulusnetworks.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=kGgkXeb8wtXfrRktcp+19MWqvGz4Wm05AP77zzsrrFU=; b=fbZM3HC72xzpuwHQMDTO/TNMmScQUKy5DHYZTvObZiErhR+TBKlKbEMzseq3wY34bW MAXztyd6VWaDFOD3WrGMYrL+zbXJbReox2IbyYXHeC+kyv3152untkWq2IcL3+7/1P+O 2W1gsTjtdjCP6XAyQbJmL0keB7gBXKzlc/kDE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=kGgkXeb8wtXfrRktcp+19MWqvGz4Wm05AP77zzsrrFU=; b=uaZTh1J6l9swNpzgFrJy+q8raZrsyIfPlMYyzlh4+xv4fXGoj8AcQAh/XIk2fn9Xc5 DJ0TbXszwLQHN7INfKFoYXmnUlETsy2e/dlcwdmt5e9Tsa3Kl14D7v+5xM53GhMxaGv1 irg027GLfDKu8B8zHD53ZZSdPgpAYcqKOzDu6q97pGhCsIBN9itn+ayjfBEv3ox29zUR umz6MPmDKh/ZBQJlFyb2dFSJKGsCKWRddWsDu/6Kfa0HCeiSTktK5GF9sgiW3w51HKD0 kyGcAHRQO0NJbZDU6u7q0yaCbyYmOxMlG296IH1FSbn272d4OpbZ4xBXr/TwgZyuy9eL KsiQ== X-Gm-Message-State: AElRT7FHMtunpTIrLI7FgkpngqA7Lt1Ws8zZyV50rdbaVUQ2jCFzIUiO a/zNMsMJnCZFuUc7YcRXffISDgiw X-Google-Smtp-Source: AG47ELtX8rsiVXJ1aG1pslxqw/yQeNfx/tpAAtIxicDhqAmXOyj8aSiOziYAEb18IRCqVrGY5LDc+A== X-Received: by 10.98.14.215 with SMTP id 84mr17614151pfo.168.1521759496668; Thu, 22 Mar 2018 15:58:16 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com. [216.129.126.126]) by smtp.googlemail.com with ESMTPSA id b78sm15807767pfe.88.2018.03.22.15.58.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Mar 2018 15:58:15 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: davem@davemloft.net, roopa@cumulusnetworks.com, shm@cumulusnetworks.com, jiri@mellanox.com, idosch@mellanox.com, jakub.kicinski@netronome.com, David Ahern Subject: [PATCH RFC net-next 4/7] net/ipv4: Allow notifier to fail route repolace Date: Thu, 22 Mar 2018 15:57:54 -0700 Message-Id: <20180322225757.10377-5-dsa@cumulusnetworks.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180322225757.10377-1-dsa@cumulusnetworks.com> References: <20180322225757.10377-1-dsa@cumulusnetworks.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Add checking to call to call_fib_entry_notifiers for IPv4 route replace. Allows a notifier handler to fail the replace. Signed-off-by: David Ahern --- net/ipv4/fib_trie.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c index d0f70a16f8de..113822aa9ea7 100644 --- a/net/ipv4/fib_trie.c +++ b/net/ipv4/fib_trie.c @@ -1219,8 +1219,13 @@ int fib_table_insert(struct net *net, struct fib_table *tb, new_fa->tb_id = tb->tb_id; new_fa->fa_default = -1; - call_fib_entry_notifiers(net, FIB_EVENT_ENTRY_REPLACE, - key, plen, new_fa, extack); + err = call_fib_entry_notifiers(net, + FIB_EVENT_ENTRY_REPLACE, + key, plen, new_fa, + extack); + if (err) + goto out_free_new_fa; + rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen, tb->tb_id, &cfg->fc_nlinfo, nlflags);