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_PASS,URIBL_BLOCKED,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 BA122C43381 for ; Mon, 25 Feb 2019 21:37:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 88F8D21841 for ; Mon, 25 Feb 2019 21:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130625; bh=gKEb1utBeW5Fyj0Iv04UWEqnpFNDBDuCKFP0ywUYdDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=0sKjMWKkK7fWQXaiTNAU0R7Hy36a1sE/y2Tf0L2f5g5KdtW4ay9BNVmcWJLpRj79T hQnKj+dOEhCbMFPyxjQWj8OQkWgxLaIiyg73SP/85CIgi+7THHQ4bilv8NbmAcdd8Z 5luIi876Bu23ZGj1fIQJ5nn3/BZMtK5fYsRVQUmk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733312AbfBYVhD (ORCPT ); Mon, 25 Feb 2019 16:37:03 -0500 Received: from mail.kernel.org ([198.145.29.99]:44212 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732428AbfBYVhC (ORCPT ); Mon, 25 Feb 2019 16:37:02 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 39B9720578; Mon, 25 Feb 2019 21:37:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1551130621; bh=gKEb1utBeW5Fyj0Iv04UWEqnpFNDBDuCKFP0ywUYdDI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kWfanVZjA0lNaUKNBUExKk2rIHjPQF+UFKCZ+35n7NRdkVuDEuOUaS8s8iG1OPBYK daZViS8Z6XnFJ2+/iphQ2J3Z4+yiGRXJKNE68aPyAS6f+1eiP5ujeOep7WoUumuv8V 4mmL3vuugeMslGG8/+LKpIszJ246Gi/QZldMpYQc= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Phil Sutter , Pablo Neira Ayuso Subject: [PATCH 4.20 178/183] netfilter: nf_tables: fix flush after rule deletion in the same batch Date: Mon, 25 Feb 2019 22:12:31 +0100 Message-Id: <20190225195125.137457991@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190225195054.748060397@linuxfoundation.org> References: <20190225195054.748060397@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ From: Pablo Neira Ayuso commit 23b7ca4f745f21c2b9cfcb67fdd33733b3ae7e66 upstream. Flush after rule deletion bogusly hits -ENOENT. Skip rules that have been already from nft_delrule_by_chain() which is always called from the flush path. Fixes: cf9dc09d0949 ("netfilter: nf_tables: fix missing rules flushing per table") Reported-by: Phil Sutter Acked-by: Phil Sutter Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman --- net/netfilter/nf_tables_api.c | 3 +++ 1 file changed, 3 insertions(+) --- a/net/netfilter/nf_tables_api.c +++ b/net/netfilter/nf_tables_api.c @@ -307,6 +307,9 @@ static int nft_delrule_by_chain(struct n int err; list_for_each_entry(rule, &ctx->chain->rules, list) { + if (!nft_is_active_next(ctx->net, rule)) + continue; + err = nft_delrule(ctx, rule); if (err < 0) return err;