mirror of
https://github.com/tailscale/tailscale.git
synced 2025-12-16 04:31:59 +00:00
net/{packet,tstun},wgengine/filter: fix unknown IP protocol handling
01b90df2faadded SCTP support before (with explicit parsing for ports) and69de3bf7bftried to add support for arbitrary IP protocols (as long as the ACL permited a port of "*", since we might not know how to find ports from an arbitrary IP protocol, if it even has such a concept). But apparently that latter commit wasn't tested end-to-end enough. It had a lot of tests, but the tests made assumptions about layering that either weren't true, or regressed since 1.20. Notably, it didn't remove the (*Filter).pre bidirectional filter that dropped all "unknown" protocol packets both leaving and entering, even if there were explicit protocol matches allowing them in. Also, don't map all unknown protocols to 0. Keep their IP protocol number parsed so it's matchable by later layers. Only reject illegal things. Fixes #6423 Updates #2162 Updates #2163 Change-Id: I9659b3ece86f4db51d644f9b34df78821758842c Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
committed by
Brad Fitzpatrick
parent
3386a59cf1
commit
c1a2e2c380
@@ -211,9 +211,11 @@ func (q *Parsed) decode4(b []byte) {
|
||||
// Inter-tailscale messages.
|
||||
q.dataofs = q.subofs
|
||||
return
|
||||
default:
|
||||
case ipproto.Fragment:
|
||||
// An IPProto value of 0xff (our Fragment constant for internal use)
|
||||
// should never actually be used in the wild; if we see it,
|
||||
// something's suspicious and we map it back to zero (unknown).
|
||||
q.IPProto = unknown
|
||||
return
|
||||
}
|
||||
} else {
|
||||
// This is a fragment other than the first one.
|
||||
@@ -312,7 +314,10 @@ func (q *Parsed) decode6(b []byte) {
|
||||
// Inter-tailscale messages.
|
||||
q.dataofs = q.subofs
|
||||
return
|
||||
default:
|
||||
case ipproto.Fragment:
|
||||
// An IPProto value of 0xff (our Fragment constant for internal use)
|
||||
// should never actually be used in the wild; if we see it,
|
||||
// something's suspicious and we map it back to zero (unknown).
|
||||
q.IPProto = unknown
|
||||
return
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user