mirror of
https://github.com/netbirdio/gvisor.git
synced 2026-05-22 17:12:49 -07:00
fix panic caused by too-large buffer allocations
Reported-by: syzbot+954128c9aa37e285d23c@syzkaller.appspotmail.com PiperOrigin-RevId: 475345594
This commit is contained in:
committed by
gVisor bot
parent
72e8fabaec
commit
48e2252b3b
@@ -7,6 +7,7 @@ go_library(
|
||||
srcs = [
|
||||
"arp.go",
|
||||
"checksum.go",
|
||||
"datagram.go",
|
||||
"eth.go",
|
||||
"gue.go",
|
||||
"icmpv4.go",
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
// Copyright 2022 The gVisor Authors.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
package header
|
||||
|
||||
// DatagramMaximumSize is the maximum supported size of a single datagram.
|
||||
const DatagramMaximumSize = 0xffff // 65KB.
|
||||
@@ -337,6 +337,11 @@ func (e *endpoint) write(p tcpip.Payloader, opts tcpip.WriteOptions) (int64, tcp
|
||||
}
|
||||
defer ctx.Release()
|
||||
|
||||
// Prevents giant buffer allocations.
|
||||
if p.Len() > header.DatagramMaximumSize {
|
||||
return 0, &tcpip.ErrMessageTooLong{}
|
||||
}
|
||||
|
||||
v := bufferv2.NewView(p.Len())
|
||||
defer v.Release()
|
||||
if _, err := io.CopyN(v, p, int64(p.Len())); err != nil {
|
||||
|
||||
@@ -234,6 +234,11 @@ func (ep *endpoint) Write(p tcpip.Payloader, opts tcpip.WriteOptions) (int64, tc
|
||||
return 0, &tcpip.ErrInvalidOptionValue{}
|
||||
}
|
||||
|
||||
// Prevents giant buffer allocations.
|
||||
if p.Len() > header.DatagramMaximumSize {
|
||||
return 0, &tcpip.ErrMessageTooLong{}
|
||||
}
|
||||
|
||||
var payload bufferv2.Buffer
|
||||
if _, err := payload.WriteFromReader(p, int64(p.Len())); err != nil {
|
||||
return 0, &tcpip.ErrBadBuffer{}
|
||||
|
||||
@@ -350,6 +350,11 @@ func (e *endpoint) write(p tcpip.Payloader, opts tcpip.WriteOptions) (int64, tcp
|
||||
return 0, &tcpip.ErrMessageTooLong{}
|
||||
}
|
||||
|
||||
// Prevents giant buffer allocations.
|
||||
if p.Len() > header.DatagramMaximumSize {
|
||||
return 0, &tcpip.ErrMessageTooLong{}
|
||||
}
|
||||
|
||||
var payload bufferv2.Buffer
|
||||
defer payload.Release()
|
||||
if _, err := payload.WriteFromReader(p, int64(p.Len())); err != nil {
|
||||
|
||||
@@ -81,6 +81,29 @@ TEST(PingSocket, ICMPPortExhaustion) {
|
||||
}
|
||||
}
|
||||
|
||||
TEST(PingSocket, PayloadTooLarge) {
|
||||
PosixErrorOr<FileDescriptor> result =
|
||||
Socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
|
||||
if (!result.ok()) {
|
||||
int errno_value = result.error().errno_value();
|
||||
ASSERT_EQ(errno_value, EACCES) << strerror(errno_value);
|
||||
GTEST_SKIP() << "ping socket not supported";
|
||||
}
|
||||
FileDescriptor& ping = result.ValueOrDie();
|
||||
|
||||
constexpr icmphdr kSendIcmp = {
|
||||
.type = ICMP_ECHO,
|
||||
};
|
||||
constexpr size_t kGiantSize = 1 << 21; // 2MB.
|
||||
const sockaddr_in kAddr = {
|
||||
.sin_family = AF_INET,
|
||||
.sin_addr = {.s_addr = htonl(INADDR_LOOPBACK)},
|
||||
};
|
||||
ASSERT_THAT(sendto(ping.get(), &kSendIcmp, kGiantSize, 0,
|
||||
reinterpret_cast<const sockaddr*>(&kAddr), sizeof(kAddr)),
|
||||
SyscallFailsWithErrno(EMSGSIZE));
|
||||
}
|
||||
|
||||
TEST(PingSocket, ReceiveTOS) {
|
||||
PosixErrorOr<FileDescriptor> result =
|
||||
Socket(AF_INET, SOCK_DGRAM, IPPROTO_ICMP);
|
||||
|
||||
Reference in New Issue
Block a user