netfilter: xt_TCPOPTSTRIP: fix possible mangling beyond packet boundary
Subsystems (2)
Pablo Neira Ayuso
maintainerPATCH v3 1/1 netfilter: xt_TCPOPTSTRIP: fix possible mangling beyond packet boundary
This target assumes that tcph->doff is well-formed, that may be well not the case. Add extra sanity checkings to avoid possible crash due to read/write out of the real packet boundary.
Reported-by Rafal Kupka <[email protected]>
Signed-off-by Pablo Neira Ayuso <[email protected]>
---
v3: remove change in the parsing option loop, spotted by Florian Westphal
net/netfilter/xt_TCPOPTSTRIP.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-)
net/netfilter/xt_TCPOPTSTRIP.c +17 -3
@@ -30,17 +30,31 @@ static inline unsigned int optlen(const u_int8_t *opt, unsigned int offset)static unsigned int tcpoptstrip_mangle_packet (struct sk_buff *skb, -const struct xt_tcpoptstrip_target_info *info, +const struct xt_action_param *par,unsigned int tcphoff,unsigned int minlen) { +const struct xt_tcpoptstrip_target_info *info = par->targinfo;unsigned int optl, i, j;struct tcphdr *tcph;u_int16_t n, o;u_int8_t *opt; +int len; + +/* This is a fragment, no TCP header is available */ +if (par->fragoff !=0 ) +return XT_CONTINUE ;if (!skb_make_writable (skb, skb->len))return NF_DROP ; + len = skb->len - tcphoff; +if (len <sizeof (struct tcphdr )) +return NF_DROP ; + +/* Truncated TCP options, skip */ +if ((tcp_hdr (skb)->doff -5 ) *4 > len -sizeof (struct tcphdr )) +return NF_DROP ; + tcph = (struct tcphdr *)(skb_network_header (skb) + tcphoff); opt = (u_int8_t *)tcph;
@@ -76,7 +90,7 @@ tcpoptstrip_mangle_packet(struct sk_buff *skb,static unsigned int tcpoptstrip_tg4 (struct sk_buff *skb,const struct xt_action_param *par) { -return tcpoptstrip_mangle_packet (skb, par->targinfo,ip_hdrlen (skb), +return tcpoptstrip_mangle_packet (skb, par,ip_hdrlen (skb),sizeof (struct iphdr ) +sizeof (struct tcphdr )); }
@@ -94,7 +108,7 @@ tcpoptstrip_tg6(struct sk_buff *skb, const struct xt_action_param *par)if (tcphoff <0 )return NF_DROP ; -return tcpoptstrip_mangle_packet (skb, par->targinfo, tcphoff, +return tcpoptstrip_mangle_packet (skb, par, tcphoff, sizeof(*ipv6h) + sizeof(struct tcphdr)); }#endif
Signature · 1 line
1.7.10.4