[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 17/27] net: limit allocation in nc_sendv_compat
From: |
Jason Wang |
Subject: |
[Qemu-devel] [PULL 17/27] net: limit allocation in nc_sendv_compat |
Date: |
Mon, 26 Sep 2016 16:59:25 +0800 |
From: Peter Lieven <address@hidden>
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 <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Jason Wang <address@hidden>
---
net/net.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/net.c b/net/net.c
index 0bec096..ec984bf 100644
--- a/net/net.c
+++ b/net/net.c
@@ -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) {
--
2.7.4
- [Qemu-devel] [PULL 08/27] colo-compare: introduce packet comparison thread, (continued)
- [Qemu-devel] [PULL 08/27] colo-compare: introduce packet comparison thread, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 09/27] colo-compare: add TCP, UDP, ICMP packet comparison, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 10/27] filter-rewriter: introduce filter-rewriter initialization, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 11/27] filter-rewriter: track connection and parse packet, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 12/27] filter-rewriter: rewrite tcp packet to keep secondary connection, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 13/27] MAINTAINERS: add maintainer for COLO-proxy, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 14/27] docs: Add documentation for COLO-proxy, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 15/27] e1000: fix buliding complaint, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 16/27] tap: Allow specifying a bridge, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 18/27] e1000e: Flush all receive queues on receive enable, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 17/27] net: limit allocation in nc_sendv_compat,
Jason Wang <=
- [Qemu-devel] [PULL 19/27] e1000e: Flush receive queues on link up, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 20/27] e1000e: Fix CTRL_EXT.EIAME behavior, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 23/27] e1000e: Fix spurious RX TCP ACK interrupts, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 21/27] e1000e: Fix PBACLR implementation, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 24/27] e1000e: Fix EIAC register implementation, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 22/27] e1000e: Fix OTHER interrupts processing for MSI-X, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 26/27] mcf_fec: fix error in qemu_send_packet argument, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 25/27] net: mcf: limit buffer descriptor count, Jason Wang, 2016/09/26
- [Qemu-devel] [PULL 27/27] imx_fec: fix error in qemu_send_packet argument, Jason Wang, 2016/09/26
- Re: [Qemu-devel] [PULL 00/27] Net patches, Peter Maydell, 2016/09/26