nft: Reject tcp/udp extension without proper protocol match
Phil Sutter
reviewerPATCH 1/1 nft: Reject tcp/udp extension without proper protocol match
Internally, 'th' expression is used, which works but matches both protocols. Since users won't expect '-m tcp --dport 1' to match UDP packets, catch missing/wrong '-p' argument.
Fixes c034cf31dd1a9 ("nft: prefer native expressions instead of udp match")
Signed-off-by Phil Sutter <[email protected]>
--- extensions/libxt_tcp.t | 3 +++ extensions/libxt_udp.t | 3 +++ iptables/nft.c | 6 ++++++ 3 files changed, 12 insertions(+)
extensions/libxt_tcp.t +3 -0
@@ -22,5 +22,8 @@ -p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG SYN;=;OK -p tcp -m tcp ! --tcp-flags FIN,SYN,RST,PSH,ACK,URG SYN;=;OK -p tcp -m tcp --tcp-flags FIN,SYN,RST,PSH,ACK,URG RST;=;OK +-m tcp --dport 1;;FAIL +-m tcp --dport 1 -p tcp;-p tcp -m tcp --dport 1;OK +-m tcp --dport 1 -p 6;-p tcp -m tcp --dport 1;OK # should we accept this below? -p tcp -m tcp;=;OK
extensions/libxt_udp.t +3 -0
@@ -18,5 +18,8 @@ # -p udp -m udp --sport 65536;;FAIL -p udp -m udp --sport -1;;FAIL -p udp -m udp --dport -1;;FAIL +-m udp --dport 1;;FAIL +-m udp --dport 1 -p udp;-p udp -m udp --dport 1;OK +-m udp --dport 1 -p 17;-p udp -m udp --dport 1;OK # should we accept this below? -p udp -m udp;=;OK
iptables/nft.c +6 -0
@@ -1360,6 +1360,9 @@ static int add_nft_udp(struct nft_handle *h, struct nftnl_rule *r,return ret; } +if (nftnl_rule_get_u32 (r,NFTNL_RULE_COMPAT_PROTO ) !=IPPROTO_UDP ) +xtables_error (PARAMETER_PROBLEM ,"UDP match requires '-p udp'" ); +return add_nft_tcpudp (h, r, udp->spts, udp->invflags &XT_UDP_INV_SRCPT , udp->dpts, udp->invflags &XT_UDP_INV_DSTPT ); }
@@ -1410,6 +1413,9 @@ static int add_nft_tcp(struct nft_handle *h, struct nftnl_rule *r,return ret; } +if (nftnl_rule_get_u32 (r,NFTNL_RULE_COMPAT_PROTO ) !=IPPROTO_TCP ) +xtables_error (PARAMETER_PROBLEM ,"TCP match requires '-p tcp'" ); +if (tcp->flg_mask) {int ret =add_nft_tcpflags (h, r, tcp->flg_cmp, tcp->flg_mask, tcp->invflags &XT_TCP_INV_FLAGS );
Signature · 1 line
2.38.0
Phil Sutter
reviewerQuoted 6 lines · Phil Sutter
Internally, 'th' expression is used, which works but matches both protocols. Since users won't expect '-m tcp --dport 1' to match UDP packets, catch missing/wrong '-p' argument.
Fixes c034cf31dd1a9 ("nft: prefer native expressions instead of udp match")Signed-off-by Phil Sutter <[email protected]>
Patch applied.