From: "Jason J. Herne" <jjherne@linux.ibm.com>
To: "Philippe Mathieu-Daudé" <philmd@linaro.org>, qemu-devel@nongnu.org
Cc: Ilya Leoshkevich <iii@linux.ibm.com>,
David Hildenbrand <david@redhat.com>,
Thomas Huth <thuth@redhat.com>, Halil Pasic <pasic@linux.ibm.com>,
qemu-s390x@nongnu.org, Eric Farman <farman@linux.ibm.com>,
Richard Henderson <richard.henderson@linaro.org>,
Christian Borntraeger <borntraeger@linux.ibm.com>,
Matthew Rosato <mjrosato@linux.ibm.com>
Subject: Re: [RFC PATCH] hw/s390x/sclp: Do not ignore address_space_read/write() errors
Date: Wed, 8 Oct 2025 10:41:21 -0400 [thread overview]
Message-ID: <11dca13e-f86a-46f5-93aa-f7f44d748ec3@linux.ibm.com> (raw)
In-Reply-To: <20251007015802.24748-1-philmd@linaro.org>
On 10/6/25 9:58 PM, Philippe Mathieu-Daudé wrote:
> If address_space_read() fails, return PGM_ADDRESSING. In the
> unlikely case address_space_write() fails (we already checked
> the address is readable), return PGM_PROTECTION.
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
> ---
> Based-on: <20251007014958.19086-1-philmd@linaro.org>
> ---
> hw/s390x/sclp.c | 22 ++++++++++++++++------
> 1 file changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
> index d7cb99482b2..8604cd305e5 100644
> --- a/hw/s390x/sclp.c
> +++ b/hw/s390x/sclp.c
> @@ -305,6 +305,7 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code)
> SCCBHeader header;
> g_autofree SCCB *work_sccb = NULL;
> AddressSpace *as = CPU(cpu)->as;
> + MemTxResult ret;
>
> /* first some basic checks on program checks */
> if (env->psw.mask & PSW_MASK_PSTATE) {
> @@ -319,8 +320,11 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code)
> }
>
> /* the header contains the actual length of the sccb */
> - address_space_read(as, sccb, MEMTXATTRS_UNSPECIFIED,
> - &header, sizeof(SCCBHeader));
> + ret = address_space_read(as, sccb, MEMTXATTRS_UNSPECIFIED,
> + &header, sizeof(SCCBHeader));
> + if (ret != MEMTX_OK) {
> + return -PGM_ADDRESSING;
> + }
>
> /* Valid sccb sizes */
> if (be16_to_cpu(header.length) < sizeof(SCCBHeader)) {
> @@ -333,8 +337,11 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code)
> * the host has checked the values
> */
> work_sccb = g_malloc0(be16_to_cpu(header.length));
> - address_space_read(as, sccb, MEMTXATTRS_UNSPECIFIED,
> - work_sccb, be16_to_cpu(header.length));
> + ret = address_space_read(as, sccb, MEMTXATTRS_UNSPECIFIED,
> + work_sccb, be16_to_cpu(header.length));
> + if (ret != MEMTX_OK) {
> + return -PGM_ADDRESSING;
> + }
>
> if (!sclp_command_code_valid(code)) {
> work_sccb->h.response_code = cpu_to_be16(SCLP_RC_INVALID_SCLP_COMMAND);
> @@ -348,8 +355,11 @@ int sclp_service_call(S390CPU *cpu, uint64_t sccb, uint32_t code)
>
> sclp_c->execute(sclp, work_sccb, code);
> out_write:
> - address_space_write(as, sccb, MEMTXATTRS_UNSPECIFIED,
> - work_sccb, be16_to_cpu(header.length));
> + ret = address_space_write(as, sccb, MEMTXATTRS_UNSPECIFIED,
> + work_sccb, be16_to_cpu(header.length));
> + if (ret != MEMTX_OK) {
> + return -PGM_PROTECTION;
> + }
>
> sclp_c->service_interrupt(sclp, sccb);
>
Reviewed-by: Jason J. Herne <jjherne@linux.ibm.com>
prev parent reply other threads:[~2025-10-08 14:42 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-07 1:58 [RFC PATCH] hw/s390x/sclp: Do not ignore address_space_read/write() errors Philippe Mathieu-Daudé
2025-10-08 12:20 ` Thomas Huth
2025-10-08 14:41 ` Jason J. Herne [this message]
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=11dca13e-f86a-46f5-93aa-f7f44d748ec3@linux.ibm.com \
--to=jjherne@linux.ibm.com \
--cc=borntraeger@linux.ibm.com \
--cc=david@redhat.com \
--cc=farman@linux.ibm.com \
--cc=iii@linux.ibm.com \
--cc=mjrosato@linux.ibm.com \
--cc=pasic@linux.ibm.com \
--cc=philmd@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-s390x@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=thuth@redhat.com \
/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).