mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tap: fix uses of l3_len in tap4_handler()

Browse source 
l3_len was calculated from the ethernet frame size, and it
was assumed to be equal to the length stored in an IP packet.
But if the ethernet frame is padded, then l3_len calculated
that way can only be used as a bound check to validate the
length stored in an IP header. It should not be used for
calculating the l4_len.

This patch makes sure the small padded ethernet frames are
properly processed, by trusting the length stored in an IP
header.

Link: https://bugs.passt.top/show_bug.cgi?id=73
Signed-off-by: Stas Sergeev <stsp2@yandex.ru>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
Stas Sergeev 2023-08-29 21:44:06 +05:00 committed by Stefano Brivio
parent a405d0c026
commit d8c4f23ecd
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tap.c
View file

@ -615,7 +615,7 @@ resume:
continue; continue;
hlen = iph->ihl * 4UL; hlen = iph->ihl * 4UL;
if (hlen < sizeof(*iph) || htons(iph->tot_len) != l3_len || if (hlen < sizeof(*iph) || htons(iph->tot_len) > l3_len ||
hlen > l3_len) hlen > l3_len)
continue; continue;
@ -623,7 +623,7 @@ resume:
if (tap4_is_fragment(iph, now)) if (tap4_is_fragment(iph, now))
continue; continue;
l4_len = l3_len - hlen; l4_len = htons(iph->tot_len) - hlen;
if (iph->saddr && c->ip4.addr_seen.s_addr != iph->saddr) if (iph->saddr && c->ip4.addr_seen.s_addr != iph->saddr)
c->ip4.addr_seen.s_addr = iph->saddr; c->ip4.addr_seen.s_addr = iph->saddr;