All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Farman <farman@linux.ibm.com>
To: Christian Borntraeger <borntraeger@linux.ibm.com>,
	Matthew Rosato <mjrosato@linux.ibm.com>
Cc: Cornelia Huck <cohuck@redhat.com>,
	qemu-s390x@nongnu.org, qemu-devel@nongnu.org,
	Eric Farman <farman@linux.ibm.com>,
	qemu-stable@nongnu.org
Subject: [PATCH v2 7/9] hw/intc/s390x: Fix check after g_try_realloc
Date: Mon, 21 Sep 2026 20:43:03 +0200	[thread overview]
Message-ID: <20260921184305.3791311-8-farman@linux.ibm.com> (raw)
In-Reply-To: <20260921184305.3791311-1-farman@linux.ibm.com>

The loop to store pending IRQs uses g_try_realloc() to expand the
buffer being used, but the returned address is stored in a
pointer-to-pointer, thus the check is supposed to be examining
the contents of the pointer, and not the pointer itself.

Define a temporary variable to catch and test the returned pointer.
If it's NULL, return to the caller to perform the free on the
unmodified buffer. If it's not NULL, store it in the caller's
pointer and restart the loop against the new struct.

Cc: qemu-stable@nongnu.org
Fixes: 3a553fc658 ("s390x/kvm: implement floating-interrupt controller device")
Signed-off-by: Eric Farman <farman@linux.ibm.com>
---
 hw/intc/s390_flic_kvm.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
index 5e6d422fba..ebee6bca9c 100644
--- a/hw/intc/s390_flic_kvm.c
+++ b/hw/intc/s390_flic_kvm.c
@@ -254,6 +254,7 @@ static int __get_all_irqs(KVMS390FLICState *flic,
                           void **buf, int len)
 {
     int r;
+    void *realloc = NULL;
 
     do {
         /* returns -ENOMEM if buffer is too small and number
@@ -263,10 +264,11 @@ static int __get_all_irqs(KVMS390FLICState *flic,
             break;
         }
         len *= 2;
-        *buf = g_try_realloc(*buf, len);
-        if (!buf) {
+        realloc = g_try_realloc(*buf, len);
+        if (!realloc) {
             return -ENOMEM;
         }
+        *buf = realloc;
     } while (r == -ENOMEM && len <= KVM_S390_FLIC_MAX_BUFFER);
 
     return r;
-- 
2.53.0



  parent reply	other threads:[~2026-09-21 18:46 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-21 18:42 [PATCH v2 0/9] s390x: even more hardening fixes Eric Farman
2026-09-21 18:42 ` [PATCH v2 1/9] virtio-ccw: Limit ISC to MAX_ISC Eric Farman
2026-09-21 18:42 ` [PATCH v2 2/9] virtio-ccw: Do not overwrite existing indicators Eric Farman
2026-09-22 19:36   ` Matthew Rosato
2026-09-21 18:42 ` [PATCH v2 3/9] virtio-ccw: Fix rc check in read configuration path Eric Farman
2026-09-21 18:43 ` [PATCH v2 4/9] vfio/ap: Clear error object pointer after non-fatal errors Eric Farman
2026-09-21 18:43 ` [PATCH v2 5/9] vfio/ccw: " Eric Farman
2026-09-21 18:43 ` [PATCH v2 6/9] hw/intc/s390x: Fix payload to KVM_HAS_DEVICE_ATTR ioctl Eric Farman
2026-09-22  8:37   ` Christian Borntraeger
2026-09-21 18:43 ` Eric Farman [this message]
2026-09-22  8:23   ` [PATCH v2 7/9] hw/intc/s390x: Fix check after g_try_realloc Christian Borntraeger
2026-09-22 19:36   ` Matthew Rosato
2026-09-21 18:43 ` [PATCH v2 8/9] s390x/css: Use datastream pointer for checking no-data CCWs Eric Farman
2026-09-22  8:35   ` Christian Borntraeger
2026-09-22 13:49     ` Eric Farman
2026-09-21 18:43 ` [PATCH v2 9/9] s390x/sclp: Reject short headers in PV case Eric Farman

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=20260921184305.3791311-8-farman@linux.ibm.com \
    --to=farman@linux.ibm.com \
    --cc=borntraeger@linux.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=mjrosato@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=qemu-stable@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.