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 v3 3/9] virtio-ccw: Fix rc check in read configuration path
Date: Tue, 22 Sep 2026 22:15:19 +0200 [thread overview]
Message-ID: <20260922201526.2383047-4-farman@linux.ibm.com> (raw)
In-Reply-To: <20260922201526.2383047-1-farman@linux.ibm.com>
Both the read and write config paths use wrappers around cds->op_handler,
depending on the direction the I/O is flowing. But they expect opposite
values in the returned variable to indicate success.
Fix this by unifying those checks, where CCW_CMD_READ_CONF needs to
see !ret as success. The end result is some erroneous data in the
SCSW response data, but the overall success/failure is correct.
Cc: qemu-stable@nongnu.org
Fixes: d895d25ae2 ("s390x: css: report errors from ccw_dstream_read/write")
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: Eric Farman <farman@linux.ibm.com>
---
hw/s390x/virtio-ccw.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index f46f936150..11441e56c1 100644
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -475,7 +475,7 @@ static int virtio_ccw_cb(SubchDev *sch, CCW1 ccw)
} else {
virtio_bus_get_vdev_config(&dev->bus, vdev->config);
ret = ccw_dstream_write_buf(&sch->cds, vdev->config, len);
- if (ret) {
+ if (!ret) {
sch->curr_status.scsw.count = ccw.count - len;
}
}
--
2.53.0
next prev parent reply other threads:[~2026-09-22 20:17 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-22 20:15 [PATCH v3 0/9] s390x: even more hardening fixes Eric Farman
2026-09-22 20:15 ` [PATCH v3 1/9] virtio-ccw: Limit ISC to MAX_ISC Eric Farman
2026-09-22 20:15 ` [PATCH v3 2/9] virtio-ccw: Do not overwrite existing indicators Eric Farman
2026-09-22 20:15 ` Eric Farman [this message]
2026-09-22 20:15 ` [PATCH v3 4/9] vfio/ap: Clear error object pointer after non-fatal errors Eric Farman
2026-09-22 20:15 ` [PATCH v3 5/9] vfio/ccw: " Eric Farman
2026-09-22 20:15 ` [PATCH v3 6/9] hw/intc/s390x: Fix payload to KVM_HAS_DEVICE_ATTR ioctl Eric Farman
2026-09-22 20:15 ` [PATCH v3 7/9] hw/intc/s390x: Fix check after g_try_realloc Eric Farman
2026-09-22 20:15 ` [PATCH v3 8/9] s390x/css: Use datastream pointer for checking no-data CCWs Eric Farman
2026-09-23 1:23 ` Matthew Rosato
2026-09-22 20:15 ` [PATCH v3 9/9] s390x/sclp: Reject short headers in PV case Eric Farman
2026-09-24 14:36 ` Janosch Frank
2026-09-24 14:39 ` Christian Borntraeger
2026-09-25 7:58 ` Janosch Frank
2026-09-25 11:52 ` Eric Farman
2026-09-23 7:21 ` [PATCH v3 0/9] s390x: even more hardening fixes Christian Borntraeger
2026-09-25 12:54 ` 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=20260922201526.2383047-4-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.