From patchwork Tue Mar 3 05:08:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1248089 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=default header.b=1L0RcrYI; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48WlR631gKz9sR4 for ; Tue, 3 Mar 2020 16:08:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727101AbgCCFIt (ORCPT ); Tue, 3 Mar 2020 00:08:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:40398 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725818AbgCCFIp (ORCPT ); Tue, 3 Mar 2020 00:08:45 -0500 Received: from kicinski-fedora-PC1C0HJN.thefacebook.com (unknown [163.114.132.128]) (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 3D42521739; Tue, 3 Mar 2020 05:08:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583212124; bh=9F7aK5GlY+bFUZvd25qhfbo8WZmzw55Hr+t0rWIjmpc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1L0RcrYI+UjkX8d2UfjGGByfqnqMoufbbqQxh+z+p18ueVKCH5//PSAtIPB00HNtp 0LqoikyIZeFEr1xSS7PaysGFrFqOVzyCfNk4JHboB8KbkNnzTS9nJf+f4z2yNgr8yU oLD1IIxlsNO33pDhdm5962B7udZuXwJk4I6ykXP8= From: Jakub Kicinski To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, fw@strlen.de, netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCH netfilter 1/3] netfilter: add missing attribute validation for cthelper Date: Mon, 2 Mar 2020 21:08:31 -0800 Message-Id: <20200303050833.4089193-2-kuba@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200303050833.4089193-1-kuba@kernel.org> References: <20200303050833.4089193-1-kuba@kernel.org> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Add missing attribute validation for cthelper to the netlink policy. Fixes: 12f7a505331e ("netfilter: add user-space connection tracking helper infrastructure") Signed-off-by: Jakub Kicinski --- net/netfilter/nfnetlink_cthelper.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/netfilter/nfnetlink_cthelper.c b/net/netfilter/nfnetlink_cthelper.c index de3a9596b7f1..a5f294aa8e4c 100644 --- a/net/netfilter/nfnetlink_cthelper.c +++ b/net/netfilter/nfnetlink_cthelper.c @@ -742,6 +742,8 @@ static const struct nla_policy nfnl_cthelper_policy[NFCTH_MAX+1] = { [NFCTH_NAME] = { .type = NLA_NUL_STRING, .len = NF_CT_HELPER_NAME_LEN-1 }, [NFCTH_QUEUE_NUM] = { .type = NLA_U32, }, + [NFCTH_PRIV_DATA_LEN] = { .type = NLA_U32, }, + [NFCTH_STATUS] = { .type = NLA_U32, }, }; static const struct nfnl_callback nfnl_cthelper_cb[NFNL_MSG_CTHELPER_MAX] = { From patchwork Tue Mar 3 05:08:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1248088 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=default header.b=EQ6QkIjU; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48WlR508Ddz9sRY for ; Tue, 3 Mar 2020 16:08:49 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726083AbgCCFIp (ORCPT ); Tue, 3 Mar 2020 00:08:45 -0500 Received: from mail.kernel.org ([198.145.29.99]:40426 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725807AbgCCFIp (ORCPT ); Tue, 3 Mar 2020 00:08:45 -0500 Received: from kicinski-fedora-PC1C0HJN.thefacebook.com (unknown [163.114.132.128]) (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 A020F2465A; Tue, 3 Mar 2020 05:08:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583212124; bh=ZS3bZpQ+Cbse6gx8MRxnC78v7gZj6LWH6FyPdy0z9+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EQ6QkIjUkyTnrynKyLKaHe/NvncPdPep7RjJDNDQ15EUxMo/b01yCLm9DGYgoW/4E 4OfgyJ/XqsCF1cOz0lztSjFN4BV0AP0P1t20lHBxfDGVE+DMD4yffnNSad9XBHsbQG 6rZy79Jgj/vvSdrG0Kc3b2zsJeTCbak5XqRLMXR4= From: Jakub Kicinski To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, fw@strlen.de, netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCH netfilter 2/3] netfilter: add missing attribute validation for payload csum flags Date: Mon, 2 Mar 2020 21:08:32 -0800 Message-Id: <20200303050833.4089193-3-kuba@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200303050833.4089193-1-kuba@kernel.org> References: <20200303050833.4089193-1-kuba@kernel.org> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Add missing attribute validation for NFTA_PAYLOAD_CSUM_FLAGS to the netlink policy. Fixes: 1814096980bb ("netfilter: nft_payload: layer 4 checksum adjustment for pseudoheader fields") Signed-off-by: Jakub Kicinski --- net/netfilter/nft_payload.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/netfilter/nft_payload.c b/net/netfilter/nft_payload.c index 1993af3a2979..a7de3a58f553 100644 --- a/net/netfilter/nft_payload.c +++ b/net/netfilter/nft_payload.c @@ -129,6 +129,7 @@ static const struct nla_policy nft_payload_policy[NFTA_PAYLOAD_MAX + 1] = { [NFTA_PAYLOAD_LEN] = { .type = NLA_U32 }, [NFTA_PAYLOAD_CSUM_TYPE] = { .type = NLA_U32 }, [NFTA_PAYLOAD_CSUM_OFFSET] = { .type = NLA_U32 }, + [NFTA_PAYLOAD_CSUM_FLAGS] = { .type = NLA_U32 }, }; static int nft_payload_init(const struct nft_ctx *ctx, From patchwork Tue Mar 3 05:08:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Kicinski X-Patchwork-Id: 1248086 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=default header.b=exhZDZEI; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48WlR36ywlz9sR4 for ; Tue, 3 Mar 2020 16:08:47 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726910AbgCCFIq (ORCPT ); Tue, 3 Mar 2020 00:08:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:40438 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725879AbgCCFIp (ORCPT ); Tue, 3 Mar 2020 00:08:45 -0500 Received: from kicinski-fedora-PC1C0HJN.thefacebook.com (unknown [163.114.132.128]) (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 0F20E24671; Tue, 3 Mar 2020 05:08:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1583212125; bh=NQSOVIl9XzNclxfGgTHbtUOwQQHboh4d4ds040VPqMI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=exhZDZEIwvjdwY9FAr1UvbaW27Mb1ZSiG/WEO7IX+WbeFj/hVUSyb1kebXdrQBdd8 zi+vztQ0OjIzQtVo2SKp5z7iLr/CXdNCMHuper5rrfYxE4/YokcDhdDxJ9y+b9fXQ4 fyuGkzcYbAAoJnyo9H6MSNrbjb2Ay5eUfGrlJYDE= From: Jakub Kicinski To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, fw@strlen.de, netdev@vger.kernel.org, Jakub Kicinski Subject: [PATCH netfilter 3/3] netfilter: nf_tables: add missing attribute validation for tunnels Date: Mon, 2 Mar 2020 21:08:33 -0800 Message-Id: <20200303050833.4089193-4-kuba@kernel.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200303050833.4089193-1-kuba@kernel.org> References: <20200303050833.4089193-1-kuba@kernel.org> MIME-Version: 1.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org 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 --- 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 4c3f2e24c7cb..764e88682a81 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, }, };