You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
33 lines
1.0 KiB
33 lines
1.0 KiB
2 years ago
|
From f94ca582531980f86fc2ffed9f1f55f7172e83f8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Pablo Neira Ayuso <pablo@netfilter.org>
|
||
|
|
Date: Fri, 10 Dec 2021 12:18:23 +0100
|
||
|
|
Subject: [PATCH] conntrack: don't cancel nest on unknown layer 4 protocols
|
||
|
|
|
||
|
|
It is valid to specify CTA_PROTO_NUM with a protocol that is not
|
||
|
|
natively supported by conntrack. Do not cancel the CTA_TUPLE_PROTO
|
||
|
|
nest in this case.
|
||
|
|
|
||
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
||
|
|
(cherry picked from commit 45ec4b51e8290759e0d87d9405965be1352a4325)
|
||
|
|
---
|
||
|
|
src/conntrack/build_mnl.c | 3 +--
|
||
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/conntrack/build_mnl.c b/src/conntrack/build_mnl.c
|
||
|
|
index d9ad268cb8900..979c0c7e995a3 100644
|
||
|
|
--- a/src/conntrack/build_mnl.c
|
||
|
|
+++ b/src/conntrack/build_mnl.c
|
||
|
|
@@ -73,8 +73,7 @@ nfct_build_tuple_proto(struct nlmsghdr *nlh, const struct __nfct_tuple *t)
|
||
|
|
mnl_attr_put_u16(nlh, CTA_PROTO_ICMPV6_ID, t->l4src.icmp.id);
|
||
|
|
break;
|
||
|
|
default:
|
||
|
|
- mnl_attr_nest_cancel(nlh, nest);
|
||
|
|
- return -1;
|
||
|
|
+ break;
|
||
|
|
}
|
||
|
|
mnl_attr_nest_end(nlh, nest);
|
||
|
|
return 0;
|
||
|
|
--
|
||
|
|
2.38.0
|
||
|
|
|