Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp3054578rwe; Mon, 29 Aug 2022 05:13:06 -0700 (PDT) X-Google-Smtp-Source: AA6agR5TblHmShPLw1zt1w7BXryUSDzvjV0l4Qh3s2jrrYR7KNzYkxPkVTQPFBN6CwxwJreSmqzR X-Received: by 2002:a05:6402:292c:b0:448:353d:1c2b with SMTP id ee44-20020a056402292c00b00448353d1c2bmr7329600edb.232.1661775186667; Mon, 29 Aug 2022 05:13:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661775186; cv=none; d=google.com; s=arc-20160816; b=MivfXHZIQORClyAebX8+SZBSdbsK4Pcbftriir3N7KA5PWMhRiLTT0BN1lsUdWAIMq hkBWLj/syP3kd+/lSNCKJ5IuZkGXvHrSi2pKivaI1KMOZfp6P4TEhvTJSy0LflOdKnzr sRonSZpNIj9aBkUnuxXXTsAeGMxOPWl5bb5HiK6JMksYZFC3Ny9V1H3mAkDxmwX6HnoN Fv9Fro/nAT7qxOE+v6l14AyWPCC/nVxE3fSLAcF6ZFsgoqgb2XIhPuIfaT6UOCSrRDPM EQruk7g7ig/RlKAngGFI9i0G2Zi3G8GErYqIlgJQUlt30sqjAuQLjRghGu/s+wWpbrZH TiIw== 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=YhXghifPE2hyf3TRxKpA3qn+zrQ9e7OFSi8HKcXdKCU=; b=gG2dc6+UIyQQgW6tVNY15upZ5q4lUx2t28lwJjgHsfsH3YqlQnApuNfWb53CjL7G7w hyJLfEdBKgC3sEm/GcSCQobObiMYlVn9yg50U2ChCrbQLA+QxurMZmfrqWa0X7iJtRB3 E/RM8FN/7hAA7N4PEJHiz/J7MwaGnrV93YCECOhoc+mg+ZsO7sNluFHrXczLt+a0kEaV rJE4M7zF+lwS07y+uNl2LY7q1uY/F8IO/o7KnFLqitXMj2mTwzXi6UG3//ISSwnWUHOZ UTDb9PbTt1/LI3iogTsy3/J9rqpQe/stz5mvcCunl2SBktKQ1/bLrZIFgFr2aZ3kXIur Qy4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b="h4w/eZH0"; 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 dm21-20020a170907949500b0072af6ec8081si7237780ejc.651.2022.08.29.05.12.40; Mon, 29 Aug 2022 05:13:06 -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="h4w/eZH0"; 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 S230460AbiH2LIB (ORCPT + 99 others); Mon, 29 Aug 2022 07:08:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44798 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230404AbiH2LHI (ORCPT ); Mon, 29 Aug 2022 07:07:08 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 539FD10FE3; Mon, 29 Aug 2022 04:04:57 -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 ams.source.kernel.org (Postfix) with ESMTPS id F2137B80EF3; Mon, 29 Aug 2022 11:04:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 53300C433C1; Mon, 29 Aug 2022 11:04:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661771095; bh=0ueb1dFP4tHhZS/U5agUHIjvYCKjpIfxMbvS/5u0iLk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h4w/eZH0y0bppUllspDDfzMIiUamzK/ZjS7cTlb8a14fOcCUw9fmvcH5ADBNXr/gq N8sBnm9dOnCjTLZgRMM9ojHoQEKMHM3l1S9a5YY/GBicKZOluU5qsr81HzWOza6r9P 8GNMoO/iRFeUP6MM7V/kNst8KwXhyCElGwfKAS/g= 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.15 061/136] netfilter: nft_tunnel: restrict it to netdev family Date: Mon, 29 Aug 2022 12:58:48 +0200 Message-Id: <20220829105807.133212941@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220829105804.609007228@linuxfoundation.org> References: <20220829105804.609007228@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 3b27926d5382c..2ee50996da8cc 100644 --- a/net/netfilter/nft_tunnel.c +++ b/net/netfilter/nft_tunnel.c @@ -133,6 +133,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