[Qemu-devel] [PULL 0/1] coverity: Fix g_malloc_n-like models

[Qemu-devel] [PULL 0/1] coverity: Fix g_malloc_n-like models

[Markus Armbruster]

This can safely go into 2.3.  I can also wait for 2.4.  Your choice.

The following changes since commit 17b11a1406fdc43b5022f32a6fbfcb005a353b38:

  Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150316' into staging (2015-03-16 18:27:13 +0000)

are available in the git repository at:


  git://repo.or.cz/qemu/armbru.git tags/pull-cov-model-2015-03-17

for you to fetch changes up to 906b8bab8bbc588f19752ed19e0222330dce31f9:

  coverity: Fix g_malloc_n-like models (2015-03-17 09:29:39 +0100)

----------------------------------------------------------------
coverity: Fix g_malloc_n-like models

----------------------------------------------------------------
Jan Kiszka (1):
  coverity: Fix g_malloc_n-like models

 scripts/coverity-model.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

-- 
1.9.3

[Qemu-devel] [PULL 1/1] coverity: Fix g_malloc_n-like models

[Markus Armbruster]

From: Jan Kiszka <jan.kiszka@siemens.com>

Allocate the calculated overall size, not only the size of a single
element.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
---
 scripts/coverity-model.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/coverity-model.c b/scripts/coverity-model.c
index 58356af..cdda259 100644
--- a/scripts/coverity-model.c
+++ b/scripts/coverity-model.c
@@ -123,7 +123,7 @@ void *g_malloc_n(size_t nmemb, size_t size)
     __coverity_negative_sink__(nmemb);
     __coverity_negative_sink__(size);
     sz = nmemb * size;
-    ptr = __coverity_alloc__(size);
+    ptr = __coverity_alloc__(sz);
     __coverity_mark_as_uninitialized_buffer__(ptr);
     __coverity_mark_as_afm_allocated__(ptr, "g_free");
     return ptr;
@@ -137,7 +137,7 @@ void *g_malloc0_n(size_t nmemb, size_t size)
     __coverity_negative_sink__(nmemb);
     __coverity_negative_sink__(size);
     sz = nmemb * size;
-    ptr = __coverity_alloc__(size);
+    ptr = __coverity_alloc__(sz);
     __coverity_writeall0__(ptr);
     __coverity_mark_as_afm_allocated__(ptr, "g_free");
     return ptr;
@@ -151,7 +151,7 @@ void *g_realloc_n(void *ptr, size_t nmemb, size_t size)
     __coverity_negative_sink__(size);
     sz = nmemb * size;
     __coverity_escape__(ptr);
-    ptr = __coverity_alloc__(size);
+    ptr = __coverity_alloc__(sz);
     /*
      * Memory beyond the old size isn't actually initialized.  Can't
      * model that.  See Coverity's realloc() model
-- 
1.9.3

Re: [Qemu-devel] [PULL 0/1] coverity: Fix g_malloc_n-like models

[Peter Maydell]

On 17 March 2015 at 10:25, Markus Armbruster <armbru@redhat.com> wrote:
> This can safely go into 2.3.  I can also wait for 2.4.  Your choice.
>
> The following changes since commit 17b11a1406fdc43b5022f32a6fbfcb005a353b38:
>
>   Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150316' into staging (2015-03-16 18:27:13 +0000)
>
> are available in the git repository at:
>
>
>   git://repo.or.cz/qemu/armbru.git tags/pull-cov-model-2015-03-17
>
> for you to fetch changes up to 906b8bab8bbc588f19752ed19e0222330dce31f9:
>
>   coverity: Fix g_malloc_n-like models (2015-03-17 09:29:39 +0100)
>
> ----------------------------------------------------------------
> coverity: Fix g_malloc_n-like models
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM