| Message ID | 1467280180-9234-1-git-send-email-pl@kamp.de |
|---|---|
| State | New |
| Headers | show |
On Thu, Jun 30, 2016 at 11:49:40AM +0200, Peter Lieven wrote: > 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> > --- > net/net.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Am 30.06.2016 um 15:39 schrieb Stefan Hajnoczi: > On Thu, Jun 30, 2016 at 11:49:40AM +0200, Peter Lieven wrote: >> 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> >> --- >> net/net.c | 8 ++++++-- >> 1 file changed, 6 insertions(+), 2 deletions(-) > Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> Can somebody pick this up please? Thanks, Peter
On 2016年09月16日 21:27, Peter Lieven wrote: > Am 30.06.2016 um 15:39 schrieb Stefan Hajnoczi: >> On Thu, Jun 30, 2016 at 11:49:40AM +0200, Peter Lieven wrote: >>> 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> >>> --- >>> net/net.c | 8 ++++++-- >>> 1 file changed, 6 insertions(+), 2 deletions(-) >> Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com> > > Can somebody pick this up please? > > Thanks, > Peter > > Picked in my tree, thanks.
diff --git a/net/net.c b/net/net.c index 5f3e5a9..54a578d 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) {
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> --- net/net.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)