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,URIBL_BLOCKED,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 848FEC35247 for ; Mon, 3 Feb 2020 16:37:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5083620CC7 for ; Mon, 3 Feb 2020 16:37:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580747849; bh=IPrmHewk90z2bfjgSVjIpJD4+5qHS7fePA67uDfcOFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=uhgsKQhcPQ2ye31F+Y1W/y4GXVe8BrmcUO+iTj7ZnRZcF5Bcs6X+XhSpyXVMEoDJt V++ooaIlhrJfmomx0K17AVWtIGKD09pz7Dpw6o1SWBJiK589oGq2npFTqqVuE9OH4H spfI2cty/+P6oqeYkSaRdGRODVEkjgtbsdlYod+c= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731323AbgBCQh2 (ORCPT ); Mon, 3 Feb 2020 11:37:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:52796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731303AbgBCQhP (ORCPT ); Mon, 3 Feb 2020 11:37:15 -0500 Received: from localhost (unknown [104.132.45.99]) (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 81B4220721; Mon, 3 Feb 2020 16:37:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580747835; bh=IPrmHewk90z2bfjgSVjIpJD4+5qHS7fePA67uDfcOFM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sl7KnGFB+eCIQtszti7s6S+byoex4LgWc0+dVZxGBaX+kFsHduGb06XmkTF0n1Mof kT8e15wSrhDC65M2R7bSkAKLwKFV8FPT5fiYY/ESiFOpQpmdpPZkBrD4hA3EsxosSl 7RAwkKHD+y2eDHEXOkzBEhrLxJu4IARPK6fqjfCc= 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 89/90] netfilter: nf_tables_offload: fix check the chain offload flag Date: Mon, 3 Feb 2020 16:20:32 +0000 Message-Id: <20200203161927.827669434@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200203161917.612554987@linuxfoundation.org> References: <20200203161917.612554987@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: wenxu [ Upstream commit c83de17dd6308fb74696923e5245de0e3c427206 ] In the nft_indr_block_cb the chain should check the flag with NFT_CHAIN_HW_OFFLOAD. Fixes: 9a32669fecfb ("netfilter: nf_tables_offload: support indr block call") Signed-off-by: wenxu Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nf_tables_offload.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/netfilter/nf_tables_offload.c b/net/netfilter/nf_tables_offload.c index 96a64e7594a51..914cd0618d5a6 100644 --- a/net/netfilter/nf_tables_offload.c +++ b/net/netfilter/nf_tables_offload.c @@ -437,7 +437,7 @@ static void nft_indr_block_cb(struct net_device *dev, mutex_lock(&net->nft.commit_mutex); chain = __nft_offload_get_chain(dev); - if (chain) { + if (chain && chain->flags & NFT_CHAIN_HW_OFFLOAD) { struct nft_base_chain *basechain; basechain = nft_base_chain(chain); -- 2.20.1