* [Qemu-devel] [PATCH] net: limit allocation in nc_sendv_compat
@ 2016-06-30 9:49 Peter Lieven
2016-06-30 13:39 ` Stefan Hajnoczi
0 siblings, 1 reply; 4+ messages in thread
From: Peter Lieven @ 2016-06-30 9:49 UTC (permalink / raw)
To: qemu-devel; +Cc: stefanha, dhannawatpooja1, jasowang, Peter Lieven
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(-)
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) {
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [Qemu-devel] [PATCH] net: limit allocation in nc_sendv_compat
2016-06-30 9:49 [Qemu-devel] [PATCH] net: limit allocation in nc_sendv_compat Peter Lieven
@ 2016-06-30 13:39 ` Stefan Hajnoczi
2016-09-16 13:27 ` Peter Lieven
0 siblings, 1 reply; 4+ messages in thread
From: Stefan Hajnoczi @ 2016-06-30 13:39 UTC (permalink / raw)
To: Peter Lieven; +Cc: qemu-devel, dhannawatpooja1, jasowang
[-- Attachment #1: Type: text/plain, Size: 422 bytes --]
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>
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 473 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] net: limit allocation in nc_sendv_compat
2016-06-30 13:39 ` Stefan Hajnoczi
@ 2016-09-16 13:27 ` Peter Lieven
2016-09-22 7:34 ` Jason Wang
0 siblings, 1 reply; 4+ messages in thread
From: Peter Lieven @ 2016-09-16 13:27 UTC (permalink / raw)
To: Stefan Hajnoczi; +Cc: qemu-devel, dhannawatpooja1, jasowang
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [Qemu-devel] [PATCH] net: limit allocation in nc_sendv_compat
2016-09-16 13:27 ` Peter Lieven
@ 2016-09-22 7:34 ` Jason Wang
0 siblings, 0 replies; 4+ messages in thread
From: Jason Wang @ 2016-09-22 7:34 UTC (permalink / raw)
To: Peter Lieven, Stefan Hajnoczi; +Cc: qemu-devel, dhannawatpooja1
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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-09-22 7:35 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-30 9:49 [Qemu-devel] [PATCH] net: limit allocation in nc_sendv_compat Peter Lieven
2016-06-30 13:39 ` Stefan Hajnoczi
2016-09-16 13:27 ` Peter Lieven
2016-09-22 7:34 ` Jason Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).