Skip to content

Sniff: Prevent crash on QUIC sniffer panic #3978

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RPRX merged 2 commits into from
Nov 11, 2024
Merged

Sniff: Prevent crash on QUIC sniffer panic #3978

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a980690
Sniff: Prevent crash on QUIC sniffer panic
Fangliding Nov 2, 2024
36e4321
fmt
RPRX Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion common/protocol/quic/sniff.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package quic

import (
"context"
"crypto"
"crypto/aes"
"crypto/tls"
Expand Down Expand Up @@ -46,7 +47,18 @@ var (
errNotQuicInitial = errors.New("not initial packet")
)

func SniffQUIC(b []byte) (*SniffHeader, error) {
func SniffQUIC(b []byte) (resultReturn *SniffHeader, errorReturn error) {
// In extremely rare cases, this sniffer may cause slice error
// and we set recover() here to prevent crash.
// TODO: Thoroughly fix this panic
defer func() {
if r := recover(); r != nil {
errors.LogError(context.Background(), "Failed to sniff QUIC: ", r)
resultReturn = nil
errorReturn = common.ErrNoClue
}
}()

// Crypto data separated across packets
cryptoLen := 0
cryptoData := bytespool.Alloc(int32(len(b)))
Expand Down