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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,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 B8798C43332 for ; Wed, 18 Mar 2020 21:08:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7F19820775 for ; Wed, 18 Mar 2020 21:08:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584565697; bh=MS6kx90JXGnbezXfqzpAbLVYZfERwq0YnoSrayV5A4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LVVdDNCZTA0dF8MVe1wMEenxZGz78Q8A5Sm6Ojt89VSSzI3uZMAeQFtbb5lXFLmli 9qvyL35iZC0NWDP0TGQQmiBjH2nlzW55joiWXc1AWlJXF0+vw0gTQNxPPCFMqMLgYm bHWeeavQkvfEUuW+Xu1W5/n9Vxu9QeuPas+V37XI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727545AbgCRUyG (ORCPT ); Wed, 18 Mar 2020 16:54:06 -0400 Received: from mail.kernel.org ([198.145.29.99]:53410 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727536AbgCRUyE (ORCPT ); Wed, 18 Mar 2020 16:54:04 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 15FCE20724; Wed, 18 Mar 2020 20:54:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584564843; bh=MS6kx90JXGnbezXfqzpAbLVYZfERwq0YnoSrayV5A4Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nd0K2jW6ao1E0kXfAA9ufPNtT7sZCzLYBT38kMPwDEAYCtqpRfefJ8q8rWSBn8Eec mBJNyVSVrAgOondL2Gc5GBAoZDjCSCxUerg+u8BxcUNH4DkUxQOWtDYR0XwuII9egM hs2GX2CYS+jBdayyu3zX07zCq/Eg/T3Sh6ldETTM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jakub Kicinski , Pablo Neira Ayuso , Sasha Levin , netfilter-devel@vger.kernel.org, coreteam@netfilter.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 22/73] netfilter: nft_tunnel: add missing attribute validation for tunnels Date: Wed, 18 Mar 2020 16:52:46 -0400 Message-Id: <20200318205337.16279-22-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200318205337.16279-1-sashal@kernel.org> References: <20200318205337.16279-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jakub Kicinski [ Upstream commit 88a637719a1570705c02cacb3297af164b1714e7 ] Add missing attribute validation for tunnel source and destination ports to the netlink policy. Fixes: af308b94a2a4 ("netfilter: nf_tables: add tunnel support") Signed-off-by: Jakub Kicinski Signed-off-by: Pablo Neira Ayuso Signed-off-by: Sasha Levin --- net/netfilter/nft_tunnel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/netfilter/nft_tunnel.c b/net/netfilter/nft_tunnel.c index 037e8fce9b30e..1effd4878619f 100644 --- a/net/netfilter/nft_tunnel.c +++ b/net/netfilter/nft_tunnel.c @@ -339,6 +339,8 @@ static const struct nla_policy nft_tunnel_key_policy[NFTA_TUNNEL_KEY_MAX + 1] = [NFTA_TUNNEL_KEY_FLAGS] = { .type = NLA_U32, }, [NFTA_TUNNEL_KEY_TOS] = { .type = NLA_U8, }, [NFTA_TUNNEL_KEY_TTL] = { .type = NLA_U8, }, + [NFTA_TUNNEL_KEY_SPORT] = { .type = NLA_U16, }, + [NFTA_TUNNEL_KEY_DPORT] = { .type = NLA_U16, }, [NFTA_TUNNEL_KEY_OPTS] = { .type = NLA_NESTED, }, }; -- 2.20.1