Check socket address size #152
Conversation
|
💚 CLA has been signed |
Cravtos
force-pushed
the
check-sockaddr-size
branch
from
fb99068 to
874245e
Compare
It sounds like we should add that fuzz test into auparse/sockaddr_test.go. WDYT @Cravtos? |
There was a problem hiding this comment.
|
Added fuzz test and updated changelog: b5915b8. |
|
/test |
andrewkroh
added
Team:Security-Linux Platform
auparse/sockaddr.go
Outdated
| "strconv" | ||
| ) | ||
|
|
||
| // errInvalidSockAddrSize means socket address size is invalid. | ||
| var errInvalidSockAddrSize = errors.New("invalid socket address size") |
There was a problem hiding this comment.
It would be nice if the errors returned included the family and the len of the provided address.
type invalidSockAddrErr struct {
family string
size int
}
func (e invalidSockAddrErr) Error() string {
return fmt.Sprintf("invalid socket address size family=%s: %d, e.family, e.size)
}
populated appropriately below.
There was a problem hiding this comment.
What family to specify in case of len(sockAddr) < 4? Or it would be better to introduce another error type for malformed families? Like so:
type invalidSockFamilyError struct {
family string
}
func (e invalidSockFamilyError) Error() string {
return fmt.Sprintf("invalid socket address family=%s", e.family)
}
// ...
if len(s) < 4 {
return nil, invalidSockFamilyError{
family: s,
}
}There was a problem hiding this comment.
Suggest either calling the family "invalid", or conditionally format an error in the Error method when the size is less than 4 and don't use the family field in that case.
type invalidSockAddrErr struct {
family string
size int
}
func (e invalidSockAddrErr) Error() string {
if e.size < 4 {
return fmt.Sprintf("invalid family: too short: %d", e.size)
}
return fmt.Sprintf("invalid socket address size family=%s: %d, e.family, e.size)
}
and in the preamble of the func,
func parseSockaddr(s string) (map[string]string, error) {
if len(s) < 4 {
return nil, invalidSockAddrErr{size: len(s)}
}
...
|
/test |
In auparse.parseSockaddr(), check socket address size before indexing into the slice to prevent panics. Return an error detailing the failure. Add a Go fuzz test to exercise the parseSockaddr() function.
Fixes panic when malformed socket address is parsed (e.g. during fuzz testing).