* [PATCH netfilter 1/3] netfilter: add missing attribute validation for cthelper
2020-03-03 5:08 [PATCH netfilter 0/3] netfilter: add missing attribute validation Jakub Kicinski
@ 2020-03-03 5:08 ` Jakub Kicinski
2020-03-03 5:08 ` [PATCH netfilter 2/3] netfilter: add missing attribute validation for payload csum flags Jakub Kicinski
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2020-03-03 5:08 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel, fw, netdev, Jakub Kicinski
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 <kuba@kernel.org>
---
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] = {
--
2.24.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH netfilter 2/3] netfilter: add missing attribute validation for payload csum flags
2020-03-03 5:08 [PATCH netfilter 0/3] netfilter: add missing attribute validation Jakub Kicinski
2020-03-03 5:08 ` [PATCH netfilter 1/3] netfilter: add missing attribute validation for cthelper Jakub Kicinski
@ 2020-03-03 5:08 ` Jakub Kicinski
2020-03-03 5:08 ` [PATCH netfilter 3/3] netfilter: nf_tables: add missing attribute validation for tunnels Jakub Kicinski
2020-03-04 1:26 ` [PATCH netfilter 0/3] netfilter: add missing attribute validation Pablo Neira Ayuso
3 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2020-03-03 5:08 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel, fw, netdev, Jakub Kicinski
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 <kuba@kernel.org>
---
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,
--
2.24.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH netfilter 3/3] netfilter: nf_tables: add missing attribute validation for tunnels
2020-03-03 5:08 [PATCH netfilter 0/3] netfilter: add missing attribute validation Jakub Kicinski
2020-03-03 5:08 ` [PATCH netfilter 1/3] netfilter: add missing attribute validation for cthelper Jakub Kicinski
2020-03-03 5:08 ` [PATCH netfilter 2/3] netfilter: add missing attribute validation for payload csum flags Jakub Kicinski
@ 2020-03-03 5:08 ` Jakub Kicinski
2020-03-04 1:26 ` [PATCH netfilter 0/3] netfilter: add missing attribute validation Pablo Neira Ayuso
3 siblings, 0 replies; 5+ messages in thread
From: Jakub Kicinski @ 2020-03-03 5:08 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel, fw, netdev, Jakub Kicinski
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 <kuba@kernel.org>
---
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, },
};
--
2.24.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH netfilter 0/3] netfilter: add missing attribute validation
2020-03-03 5:08 [PATCH netfilter 0/3] netfilter: add missing attribute validation Jakub Kicinski
` (2 preceding siblings ...)
2020-03-03 5:08 ` [PATCH netfilter 3/3] netfilter: nf_tables: add missing attribute validation for tunnels Jakub Kicinski
@ 2020-03-04 1:26 ` Pablo Neira Ayuso
3 siblings, 0 replies; 5+ messages in thread
From: Pablo Neira Ayuso @ 2020-03-04 1:26 UTC (permalink / raw)
To: Jakub Kicinski; +Cc: netfilter-devel, fw, netdev
On Mon, Mar 02, 2020 at 09:08:30PM -0800, Jakub Kicinski wrote:
> Hi!
>
> Netfilter and nf_tables is missing a handful of netlink policy entries.
Series applied, thank you!
^ permalink raw reply [flat|nested] 5+ messages in thread