Skip to content

Commit

Permalink
net: limit allocation in nc_sendv_compat
Browse files Browse the repository at this point in the history
we only need to allocate enough memory to hold the packet. This might be
less than NET_BUFSIZE. Additionally fail early if the packet is larger
than NET_BUFSIZE.

Signed-off-by: Peter Lieven <pl@kamp.de>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
  • Loading branch information
plieven authored and jasowang committed Sep 27, 2016
1 parent 584613e commit 47f9f15
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions net/net.c
Expand Up @@ -690,9 +690,13 @@ static ssize_t nc_sendv_compat(NetClientState *nc, const struct iovec *iov,
buffer = iov[0].iov_base;
offset = iov[0].iov_len;
} else {
buf = g_new(uint8_t, NET_BUFSIZE);
offset = iov_size(iov, iovcnt);
if (offset > NET_BUFSIZE) {
return -1;
}
buf = g_malloc(offset);
buffer = buf;
offset = iov_to_buf(iov, iovcnt, 0, buf, NET_BUFSIZE);
offset = iov_to_buf(iov, iovcnt, 0, buf, offset);
}

if (flags & QEMU_NET_PACKET_FLAG_RAW && nc->info->receive_raw) {
Expand Down

0 comments on commit 47f9f15

Please sign in to comment.