Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp4012612ybl; Mon, 3 Feb 2020 10:50:13 -0800 (PST) X-Google-Smtp-Source: APXvYqxkIyKyfvyVJNtlpSuJR6UWJ+aKvJuBM7C9ObuXXboYtJOjUswz4Vz8YqyR3oJXNq2d7j2O X-Received: by 2002:a05:6830:1188:: with SMTP id u8mr18999691otq.274.1580755813056; Mon, 03 Feb 2020 10:50:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580755813; cv=none; d=google.com; s=arc-20160816; b=tWzPr7ZnarwhXH2He0ykPp1r4btaJEtqbLtM3hkHQTtOSWI+1+e4zMa6aNgOIyRI+o Z9cIbYd4ZrAuPrK6HAK6iWp/235CZeg75u+BhkKTcwBC0FhJn9nQ86YV6QuyNVfwIKot FDeIvf1XnWrjB4skbfkuWoCpGINFgZLEeBnxmdfw0YeBxL7Vx1d2T1g73yFV2h5t1CR5 m592ornJdEBLW0H5pfwA5g+GGmEHKEfpqr8bfrkH297Lbk2zZu00Pr/Zg1g7S+V6kxiW fr+mE68MAj+58PDkM6sBsn3n0I5uboIo9ebfbGMz+qObXmrMT3jBos/dHCBaQVSiMa+8 IxLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=VS9eRWbYuKWu9Q8JTwKu6lQ3OV2z/hTtGQdN78uBzKU=; b=TEbC2v4s9m0iVN72/101uQd5aGfULvtjiKWXQKRbA3RuJ3aGO5YDuDjfkUzRNhdVYH 0mAD+uI7pBJClUnUKNJDHfjgV2ue6T36uUl60poCPDkn5BScx3x4B2lokg7j8vS25PlA YhCeAQEfLtSYvzAAaat7OtHtaVdAaUX7K/HI2HtTsROmPmZkEOXkx7Of+asW/VqAK9Zr Rt0P43APlFj4tzSc1eD/rOaWox1Sw7HMNQZGIC2JvqTuVezEz6x/aGiD3JQacvaEfe/l rBVyWqez55lyol9n6kYdwuHMWtnGZfU1D37j841qcoO4Jn2FHpbx6srbrGxiAlrL+MS4 lcvQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sl7KnGFB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u21si9903321otq.137.2020.02.03.10.50.00; Mon, 03 Feb 2020 10:50:13 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sl7KnGFB; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730861AbgBCQh1 (ORCPT + 99 others); Mon, 3 Feb 2020 11:37:27 -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