* [Qemu-devel] [PATCH v2] net: vmxnet: use g_new for pkt initialisation
@ 2016-08-16 11:28 P J P
2016-08-16 11:29 ` Dmitry Fleytman
0 siblings, 1 reply; 3+ messages in thread
From: P J P @ 2016-08-16 11:28 UTC (permalink / raw)
To: Qemu developers; +Cc: Peter Maydell, Dmitry Fleytman, Jason Wang, Li Qiang
From: Li Qiang <liqiang6-s@360.cn>
When network transport abstraction layer initialises pkt, the maximum
fragmentation count is not checked. This could lead to an integer
overflow causing a NULL pointer dereference. Replace g_malloc() with
g_new() to catch the multiplication overflow.
Reported-by: Li Qiang <liqiang6-s@360.cn>
Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
---
hw/net/net_tx_pkt.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Update as per review:
-> https://lists.gnu.org/archive/html/qemu-devel/2016-08/msg02544.html
diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
index 53dfaa2..20b2549 100644
--- a/hw/net/net_tx_pkt.c
+++ b/hw/net/net_tx_pkt.c
@@ -65,10 +65,9 @@ void net_tx_pkt_init(struct NetTxPkt **pkt, PCIDevice *pci_dev,
p->pci_dev = pci_dev;
- p->vec = g_malloc((sizeof *p->vec) *
- (max_frags + NET_TX_PKT_PL_START_FRAG));
+ p->vec = g_new(struct iovec, max_frags + NET_TX_PKT_PL_START_FRAG);
- p->raw = g_malloc((sizeof *p->raw) * max_frags);
+ p->raw = g_new(struct iovec, max_frags);
p->max_payload_frags = max_frags;
p->max_raw_frags = max_frags;
--
2.5.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [Qemu-devel] [PATCH v2] net: vmxnet: use g_new for pkt initialisation
2016-08-16 11:28 [Qemu-devel] [PATCH v2] net: vmxnet: use g_new for pkt initialisation P J P
@ 2016-08-16 11:29 ` Dmitry Fleytman
2016-08-18 4:03 ` Jason Wang
0 siblings, 1 reply; 3+ messages in thread
From: Dmitry Fleytman @ 2016-08-16 11:29 UTC (permalink / raw)
To: P J P; +Cc: Qemu developers, Peter Maydell, Jason Wang, Li Qiang
acked-by: Dmitry Fleytman <dmitry@daynix.com>
> On 16 Aug 2016, at 14:28, P J P <ppandit@redhat.com> wrote:
>
> From: Li Qiang <liqiang6-s@360.cn>
>
> When network transport abstraction layer initialises pkt, the maximum
> fragmentation count is not checked. This could lead to an integer
> overflow causing a NULL pointer dereference. Replace g_malloc() with
> g_new() to catch the multiplication overflow.
>
> Reported-by: Li Qiang <liqiang6-s@360.cn>
> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
> ---
> hw/net/net_tx_pkt.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> Update as per review:
> -> https://lists.gnu.org/archive/html/qemu-devel/2016-08/msg02544.html
>
> diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
> index 53dfaa2..20b2549 100644
> --- a/hw/net/net_tx_pkt.c
> +++ b/hw/net/net_tx_pkt.c
> @@ -65,10 +65,9 @@ void net_tx_pkt_init(struct NetTxPkt **pkt, PCIDevice *pci_dev,
>
> p->pci_dev = pci_dev;
>
> - p->vec = g_malloc((sizeof *p->vec) *
> - (max_frags + NET_TX_PKT_PL_START_FRAG));
> + p->vec = g_new(struct iovec, max_frags + NET_TX_PKT_PL_START_FRAG);
>
> - p->raw = g_malloc((sizeof *p->raw) * max_frags);
> + p->raw = g_new(struct iovec, max_frags);
>
> p->max_payload_frags = max_frags;
> p->max_raw_frags = max_frags;
> --
> 2.5.5
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [Qemu-devel] [PATCH v2] net: vmxnet: use g_new for pkt initialisation
2016-08-16 11:29 ` Dmitry Fleytman
@ 2016-08-18 4:03 ` Jason Wang
0 siblings, 0 replies; 3+ messages in thread
From: Jason Wang @ 2016-08-18 4:03 UTC (permalink / raw)
To: Dmitry Fleytman, P J P; +Cc: Peter Maydell, Li Qiang, Qemu developers
On 2016年08月16日 19:29, Dmitry Fleytman wrote:
> acked-by: Dmitry Fleytman <dmitry@daynix.com>
>
>> On 16 Aug 2016, at 14:28, P J P <ppandit@redhat.com> wrote:
>>
>> From: Li Qiang <liqiang6-s@360.cn>
>>
>> When network transport abstraction layer initialises pkt, the maximum
>> fragmentation count is not checked. This could lead to an integer
>> overflow causing a NULL pointer dereference. Replace g_malloc() with
>> g_new() to catch the multiplication overflow.
>>
>> Reported-by: Li Qiang <liqiang6-s@360.cn>
>> Signed-off-by: Prasad J Pandit <pjp@fedoraproject.org>
>> ---
>> hw/net/net_tx_pkt.c | 5 ++---
>> 1 file changed, 2 insertions(+), 3 deletions(-)
>>
>> Update as per review:
>> -> https://lists.gnu.org/archive/html/qemu-devel/2016-08/msg02544.html
>>
>> diff --git a/hw/net/net_tx_pkt.c b/hw/net/net_tx_pkt.c
>> index 53dfaa2..20b2549 100644
>> --- a/hw/net/net_tx_pkt.c
>> +++ b/hw/net/net_tx_pkt.c
>> @@ -65,10 +65,9 @@ void net_tx_pkt_init(struct NetTxPkt **pkt, PCIDevice *pci_dev,
>>
>> p->pci_dev = pci_dev;
>>
>> - p->vec = g_malloc((sizeof *p->vec) *
>> - (max_frags + NET_TX_PKT_PL_START_FRAG));
>> + p->vec = g_new(struct iovec, max_frags + NET_TX_PKT_PL_START_FRAG);
>>
>> - p->raw = g_malloc((sizeof *p->raw) * max_frags);
>> + p->raw = g_new(struct iovec, max_frags);
>>
>> p->max_payload_frags = max_frags;
>> p->max_raw_frags = max_frags;
>> --
>> 2.5.5
>>
Applied, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-08-18 4:03 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-08-16 11:28 [Qemu-devel] [PATCH v2] net: vmxnet: use g_new for pkt initialisation P J P
2016-08-16 11:29 ` Dmitry Fleytman
2016-08-18 4:03 ` 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).