Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp1975587rwe; Fri, 2 Sep 2022 06:52:18 -0700 (PDT) X-Google-Smtp-Source: AA6agR6nMXCTHsWmaRSlXuoKk9JBth/7wB2+5Jd5VH9X1U434ISH8ryI+aXVKtO6C+JidpSlW5K9 X-Received: by 2002:a17:903:1091:b0:173:3c23:29aa with SMTP id u17-20020a170903109100b001733c2329aamr35648371pld.154.1662126738671; Fri, 02 Sep 2022 06:52:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662126738; cv=none; d=google.com; s=arc-20160816; b=ZaU2hb8O9zyZBFLT9045f5z0pXWAsSQ1ooWEDWp53u3j9l1Yx8GTVxYSmX+bX26N98 J0gTg049WRQvZtwPrZVMncNXxOyUoI7MPpWVBPTzf65lWkMwOidoBtCN5qW2l5zYgxbZ kmMzSFNq/KV04wgPmRMtG+YEB1S1GKGCOPlyWFLO6pJD5VuiAVBml/8Fq7FWpPxA/Dq6 Rf5M8UW1kSWiJBCIWYFIG3/dSUJX+6M9RtSbOCEOBkPx2MTQMkdDmBiZEtuFtBnkesNe daBP+laZLcXbNV+OQwZty7hkUkDo9uhmCxxTuBXBQp+xSA3e8gG1xqmDAMmCa6U2vvxs b2GQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=pqR1bUOU+4Aa9b/CWed1kohirmx6CrPzQxaZZWIhmjQ=; b=IwxQetbLmv7TmeqrbOcYtKyErEyCZXICRHpnKFxyr/QR2+VtYwhMdJxwlW4NQcZZEL Zq664y80oJmH2gxxRxKXzUTM7QGcKyN0ebZ63liDqnfbiV/zPsRLW5yf66x41/Zm6ZG3 +dFIx7kUd+LFq2D8zoS36e9RKwmlIS70DVEfhf4J9JYrncWejs1oRwT7N2+bcL3mUAC1 o24TGHcExlu2VELGS0PPaEqpC1MGnPDpbr/iMjW3JFtu+kZJNeFCW3fohc6/YsolXmCj X1LebU02UaR6m1nF2CAVvKiE6BJap76u3k39A5r8TcsvMGiso+q8zWC8QlVzkITgYaEE lEKA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yanoOMFn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y135-20020a62ce8d000000b00539a0cb3d41si2125346pfg.139.2022.09.02.06.51.59; Fri, 02 Sep 2022 06:52:18 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=yanoOMFn; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237104AbiIBMmm (ORCPT + 99 others); Fri, 2 Sep 2022 08:42:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41128 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237031AbiIBMls (ORCPT ); Fri, 2 Sep 2022 08:41:48 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 18AD3E869C; Fri, 2 Sep 2022 05:31:31 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 3BCFF620B6; Fri, 2 Sep 2022 12:29:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 30DBEC433C1; Fri, 2 Sep 2022 12:29:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1662121760; bh=P+jaSS/ABgscCL7bOLfDbwgtwfZD4mI/GtjODIiIDI0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yanoOMFn4dFi/Cxec7xHng3g9FSG8EFKrICf2gHm7NwGcyBmctgsFGOoyIu4A6ha+ 3yfQt87+UrIsAMmlkoBD2RcrLBmbNMcu7oQRvix+EUd1W30YwJnTe1Y8ymZf6ekxQ2 Y0ZNrWB3CtkLVO/tN5WgMU6EW9AMN9oQIdV7xclA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Pablo Neira Ayuso , Sasha Levin Subject: [PATCH 5.4 25/77] netfilter: nft_tunnel: restrict it to netdev family Date: Fri, 2 Sep 2022 14:18:34 +0200 Message-Id: <20220902121404.488271284@linuxfoundation.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20220902121403.569927325@linuxfoundation.org> References: <20220902121403.569927325@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Pablo Neira Ayuso [ Upstream commit 01e4092d53bc4fe122a6e4b6d664adbd57528ca3 ] Only allow to use this expression from NFPROTO_NETDEV family. Fixes: af308b94a2a4 ("netfilter: nf_tables: add tunnel support") Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nft_tunnel.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c index 1effd4878619f..4e850c81ad8d8 100644 --- a/net/netfilter/nft_tunnel.c +++ b/net/netfilter/nft_tunnel.c @@ -134,6 +134,7 @@ static const struct nft_expr_ops nft_tunnel_get_ops = { static struct nft_expr_type nft_tunnel_type __read_mostly = { .name = "tunnel", + .family = NFPROTO_NETDEV, .ops = &nft_tunnel_get_ops, .policy = nft_tunnel_policy, .maxattr = NFTA_TUNNEL_MAX, -- 2.35.1