qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Paolo Bonzini <pbonzini@redhat.com>
To: qemu-devel@nongnu.org
Subject: [PULL 7/8] coverity-model: constrain g_malloc/g_malloc0/g_realloc as never returning NULL
Date: Mon,  2 Aug 2021 18:15:41 +0200	[thread overview]
Message-ID: <20210802161542.381976-8-pbonzini@redhat.com> (raw)
In-Reply-To: <20210802161542.381976-1-pbonzini@redhat.com>

g_malloc/g_malloc0/g_realloc only return NULL if the size is 0; we do not need
to cover that in the model, and so far have expected __coverity_alloc__
to model a non-NULL return value.  But that apparently does not work
anymore, so add some extra conditionals that invoke __coverity_panic__
for NULL pointers.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 scripts/coverity-scan/model.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/coverity-scan/model.c b/scripts/coverity-scan/model.c
index 2d384bdd79..028f13e9e3 100644
--- a/scripts/coverity-scan/model.c
+++ b/scripts/coverity-scan/model.c
@@ -183,6 +183,9 @@ void *g_malloc_n(size_t nmemb, size_t size)
     __coverity_negative_sink__(nmemb);
     __coverity_negative_sink__(size);
     ptr = __coverity_alloc__(nmemb * size);
+    if (!ptr) {
+        __coverity_panic__();
+    }
     __coverity_mark_as_uninitialized_buffer__(ptr);
     __coverity_mark_as_afm_allocated__(ptr, AFM_free);
     return ptr;
@@ -195,6 +198,9 @@ void *g_malloc0_n(size_t nmemb, size_t size)
     __coverity_negative_sink__(nmemb);
     __coverity_negative_sink__(size);
     ptr = __coverity_alloc__(nmemb * size);
+    if (!ptr) {
+        __coverity_panic__();
+    }
     __coverity_writeall0__(ptr);
     __coverity_mark_as_afm_allocated__(ptr, AFM_free);
     return ptr;
@@ -206,6 +212,9 @@ void *g_realloc_n(void *ptr, size_t nmemb, size_t size)
     __coverity_negative_sink__(size);
     __coverity_escape__(ptr);
     ptr = __coverity_alloc__(nmemb * size);
+    if (!ptr) {
+        __coverity_panic__();
+    }
     /*
      * Memory beyond the old size isn't actually initialized.  Can't
      * model that.  See Coverity's realloc() model
-- 
2.31.1




  parent reply	other threads:[~2021-08-02 16:19 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-02 16:15 [PULL 0/8] vl.c, coverity patches for QEMU 6.1-rc2 Paolo Bonzini
2021-08-02 16:15 ` [PULL 1/8] vl: introduce machine_merge_property Paolo Bonzini
2021-08-02 16:15 ` [PULL 2/8] vl: stop recording -smp in QemuOpts Paolo Bonzini
2021-08-02 16:15 ` [PULL 3/8] coverity-model: update address_space_read/write models Paolo Bonzini
2021-08-02 16:15 ` [PULL 4/8] coverity-model: make g_free a synonym of free Paolo Bonzini
2021-08-02 16:15 ` [PULL 5/8] coverity-model: remove model for more allocation functions Paolo Bonzini
2021-08-02 16:15 ` [PULL 6/8] coverity-model: clean up the models for array " Paolo Bonzini
2021-08-02 16:15 ` Paolo Bonzini [this message]
2021-08-02 16:15 ` [PULL 8/8] coverity-model: write models fully for non-array " Paolo Bonzini
2021-08-02 19:12 ` [PULL 0/8] vl.c, coverity patches for QEMU 6.1-rc2 Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210802161542.381976-8-pbonzini@redhat.com \
    --to=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).