mirrors/dae
1
0
Fork 0
mirror of https://github.com/daeuniverse/dae.git synced 2025-07-20 20:59:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

fix: truncated dns resp (#203)

Browse Source
This commit is contained in:
mzz
2023-07-11 01:25:05 +08:00
committed by GitHub
parent 11d2ea945f
commit 1cc9edc0c6
7 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
common/netutils/dns.go
View File

@ -15,6 +15,7 @@ import (
"sync"
"time"
"github.com/daeuniverse/dae/common/consts"
dnsmessage "github.com/miekg/dns"
"github.com/mzz2017/softwind/netproxy"
"github.com/mzz2017/softwind/pkg/fastrand"
@ -240,8 +241,8 @@ func resolve(ctx context.Context, d netproxy.Dialer, dns netip.AddrPort, host st
}()
}
go func() {
buf := pool.Get(512)
defer pool.Put(buf)
buf := pool.GetFullCap(consts.EthernetMtu)
defer buf.Put()
if magicNetwork.Network == "tcp" {
// Read DNS response length
_, err := io.ReadFull(c, buf[:2])
@ -250,7 +251,7 @@ func resolve(ctx context.Context, d netproxy.Dialer, dns netip.AddrPort, host st
return
}
n := binary.BigEndian.Uint16(buf)
if n > 512 {
if int(n) > cap(buf) {
ch <- fmt.Errorf("too big dns resp")
return
}