All of lore.kernel.org
 help / color / mirror / Atom feed
From: Eric Farman <farman@linux.ibm.com>
To: qemu-devel@nongnu.org
Cc: qemu-s390x@nongnu.org, Matthew Rosato <mjrosato@linux.ibm.com>,
	Cornelia Huck <cohuck@redhat.com>,
	Eric Farman <farman@linux.ibm.com>,
	qemu-stable@nongnu.org
Subject: [PULL 07/23] hw/intc/s390x: Fix check after g_try_realloc
Date: Wed, 30 Sep 2026 11:24:04 -0400	[thread overview]
Message-ID: <20260930152420.1956230-8-farman@linux.ibm.com> (raw)
In-Reply-To: <20260930152420.1956230-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")
Reviewed-by: Christian Borntraeger <borntraeger@linux.ibm.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Link: https://lore.kernel.org/qemu-devel/20260922201526.2383047-8-farman@linux.ibm.com
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..63c6ce81d9 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 *new_buf = 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) {
+        new_buf = g_try_realloc(*buf, len);
+        if (!new_buf) {
             return -ENOMEM;
         }
+        *buf = new_buf;
     } while (r == -ENOMEM && len <= KVM_S390_FLIC_MAX_BUFFER);
 
     return r;
-- 
2.55.0



  parent reply	other threads:[~2026-09-30 15:25 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-09-30 15:23 [PULL 00/23] s390x queue Eric Farman
2026-09-30 15:23 ` [PULL 01/23] virtio-ccw: Limit ISC to MAX_ISC Eric Farman
2026-09-30 15:23 ` [PULL 02/23] virtio-ccw: Do not overwrite existing indicators Eric Farman
2026-09-30 15:24 ` [PULL 03/23] virtio-ccw: Fix rc check in read configuration path Eric Farman
2026-09-30 15:24 ` [PULL 04/23] vfio/ap: Clear error object pointer after non-fatal errors Eric Farman
2026-09-30 15:24 ` [PULL 05/23] vfio/ccw: " Eric Farman
2026-09-30 15:24 ` [PULL 06/23] hw/intc/s390x: Fix payload to KVM_HAS_DEVICE_ATTR ioctl Eric Farman
2026-09-30 15:24 ` Eric Farman [this message]
2026-09-30 15:24 ` [PULL 08/23] s390x/css: Use datastream pointer for checking no-data CCWs Eric Farman
2026-09-30 15:24 ` [PULL 09/23] s390x/sclp: Reject short headers in PV case Eric Farman
2026-09-30 15:24 ` [PULL 10/23] s390x: Expose pv attribute in QOM Eric Farman
2026-09-30 15:24 ` [PULL 11/23] pc-bios/s390-ccw: Move CCW net setup to virtio-ccw Eric Farman
2026-09-30 15:24 ` [PULL 12/23] pc-bios/s390-ccw: Add dynamic net header size handling Eric Farman
2026-09-30 15:24 ` [PULL 13/23] pc-bios/s390-ccw: Introduce virtio_tswap helpers Eric Farman
2026-09-30 15:24 ` [PULL 14/23] pc-bios/s390-ccw: Add support for virtio-net-pci IPL Eric Farman
2026-09-30 15:24 ` [PULL 15/23] hw/virtio: Add "loadparm" property to virtio net PCI devices booting on s390x Eric Farman
2026-09-30 15:24 ` [PULL 16/23] tests/qtest: Check s390x boot device support in pxe-test.c Eric Farman
2026-10-07 20:02   ` Bernhard Beschow
2026-10-08 12:19     ` Eric Farman
2026-09-30 15:24 ` [PULL 17/23] tests/qtest: Add s390x virtio net PCI test to pxe-test.c Eric Farman
2026-09-30 15:24 ` [PULL 18/23] tests/functional/s390x: Add tests for virtio net PCI in test_pxelinux.py Eric Farman
2026-09-30 15:24 ` [PULL 19/23] s390x/sclpconsole: fix indentation for console_reset Eric Farman
2026-09-30 15:24 ` [PULL 20/23] s390x/pci: Fix frame stepping in rpcit_service_call() Eric Farman
2026-09-30 15:24 ` [PULL 21/23] s390x/pci: Use qemu_log_mask() for guest-triggered errors in reg_ioat() Eric Farman
2026-09-30 15:24 ` [PULL 22/23] s390x/pci: Reject apertures beyond IOAT capacity in translation mode Eric Farman
2026-09-30 15:24 ` [PULL 23/23] pc-bios/s390-ccw.img: update s390x bios Eric Farman
2026-10-01  7:03 ` [PULL 00/23] s390x queue Richard Henderson

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=20260930152420.1956230-8-farman@linux.ibm.com \
    --to=farman@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.