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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 CC03EC33C9E for ; Sat, 11 Jan 2020 10:25:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 99C6B2082E for ; Sat, 11 Jan 2020 10:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738311; bh=9pq68zwuBtcHgShwLeWaVi65N0QZZnhESnqWP6ebRYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=UwPPX9ZUBv8xi1g+ed9axJTox0X5bTYUVxzW6WEM1X6o+/UV9baVND1ZWoNgeIwSK s1X666Qs+Yr3n4XDFRXp6jgyS1mtVMNhVp2B/p0U0gqd+6/OAuv+3fgrkk1t9G1kGb HhVa2D/BAoZhlApQWq+ViCzp5NlF4S+D4DhaADvI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730810AbgAKKWF (ORCPT ); Sat, 11 Jan 2020 05:22:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:46616 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730529AbgAKKWF (ORCPT ); Sat, 11 Jan 2020 05:22:05 -0500 Received: from localhost (unknown [62.119.166.9]) (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 16008205F4; Sat, 11 Jan 2020 10:22:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578738124; bh=9pq68zwuBtcHgShwLeWaVi65N0QZZnhESnqWP6ebRYY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mXjEejX1+SESuxfw4K83SuPSpqqZVgIEL4ZqytmIsKOeO1RKUtA6znTlJ9gyNSXsX BNlSF5a1xBJi2nDK53Wv63SX3OAYCvYr9DC1+j9651ImRTQrxFrr55nNh2CBy8ykBq QGhNnz8bApXHSo6phXIhypVUnPF2lYv0CkftCQUQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, wenxu , Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.4 013/165] netfilter: nf_tables_offload: Check for the NETDEV_UNREGISTER event Date: Sat, 11 Jan 2020 10:48:52 +0100 Message-Id: <20200111094922.204772138@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200111094921.347491861@linuxfoundation.org> References: <20200111094921.347491861@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: wenxu [ Upstream commit d1f4c966475c6dd2545c6625022cb24e878bee11 ] Check for the NETDEV_UNREGISTER event from the nft_offload_netdev_event function, which is the event that actually triggers the clean up. Fixes: 06d392cbe3db ("netfilter: nf_tables_offload: remove rules when the device unregisters") Signed-off-by: wenxu Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_offload.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c index 5f6037695dee..6f7eab502e65 100644 --- a/net/netfilter/nf_tables_offload.c +++ b/net/netfilter/nf_tables_offload.c @@ -446,6 +446,9 @@ static int nft_offload_netdev_event(struct notifier_block *this, struct net *net = dev_net(dev); struct nft_chain *chain; + if (event != NETDEV_UNREGISTER) + return NOTIFY_DONE; + mutex_lock(&net->nft.commit_mutex); chain = __nft_offload_get_chain(dev); if (chain) -- 2.20.1