qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Ilya Leoshkevich <iii@linux.ibm.com>
To: Laurent Vivier <laurent@vivier.eu>,
	Richard Henderson <richard.henderson@linaro.org>,
	David Hildenbrand <david@redhat.com>
Cc: Thomas Huth <thuth@redhat.com>,
	qemu-devel@nongnu.org, qemu-s390x@nongnu.org,
	Ilya Leoshkevich <iii@linux.ibm.com>,
	qemu-stable@nongnu.org
Subject: [PATCH v2 04/12] target/s390x: Fix MVCRL with a large value in R0
Date: Tue,  4 Jul 2023 10:12:28 +0200	[thread overview]
Message-ID: <20230704081506.276055-5-iii@linux.ibm.com> (raw)
In-Reply-To: <20230704081506.276055-1-iii@linux.ibm.com>

Using a large R0 causes an assertion error:

    qemu-s390x: target/s390x/tcg/mem_helper.c:183: access_prepare_nf: Assertion `size > 0 && size <= 4096' failed.

Even though PoP explicitly advises against using more than 8 bits for the
size, an emulator crash is never a good thing.

Fix by truncating the size to 8 bits.

Fixes: ea0a1053e276 ("s390x/tcg: Implement Miscellaneous-Instruction-Extensions Facility 3 for the s390x")
Cc: qemu-stable@nongnu.org
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
---
 target/s390x/tcg/mem_helper.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/target/s390x/tcg/mem_helper.c b/target/s390x/tcg/mem_helper.c
index d02ec861d8b..84ad85212c9 100644
--- a/target/s390x/tcg/mem_helper.c
+++ b/target/s390x/tcg/mem_helper.c
@@ -514,6 +514,7 @@ void HELPER(mvcrl)(CPUS390XState *env, uint64_t l, uint64_t dest, uint64_t src)
     int32_t i;
 
     /* MVCRL always copies one more byte than specified - maximum is 256 */
+    l &= 0xff;
     l++;
 
     access_prepare(&srca, env, src, l, MMU_DATA_LOAD, mmu_idx, ra);
-- 
2.41.0



  parent reply	other threads:[~2023-07-04  8:35 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-04  8:12 [PATCH v2 00/12] target/s390x: Miscellaneous TCG fixes Ilya Leoshkevich
2023-07-04  8:12 ` [PATCH v2 01/12] linux-user: elfload: Add more initial s390x PSW bits Ilya Leoshkevich
2023-07-04  8:12 ` [PATCH v2 02/12] target/s390x: Fix EPSW CC reporting Ilya Leoshkevich
2023-07-04  8:12 ` [PATCH v2 03/12] target/s390x: Fix MDEB and MDEBR Ilya Leoshkevich
2023-07-04  8:12 ` Ilya Leoshkevich [this message]
2023-07-04  8:12 ` [PATCH v2 05/12] target/s390x: Fix LRA overwriting the top 32 bits on DAT error Ilya Leoshkevich
2023-07-04  8:16   ` David Hildenbrand
2023-07-04  8:12 ` [PATCH v2 06/12] target/s390x: Fix LRA when DAT is off Ilya Leoshkevich
2023-07-04  8:12 ` [PATCH v2 07/12] target/s390x: Fix relative long instructions with large offsets Ilya Leoshkevich
2023-07-04  8:12 ` [PATCH v2 08/12] tests/tcg/s390x: Test EPSW Ilya Leoshkevich
2023-07-04  8:12 ` [PATCH v2 09/12] tests/tcg/s390x: Test LARL with a large offset Ilya Leoshkevich
2023-07-04  8:12 ` [PATCH v2 10/12] tests/tcg/s390x: Test LRA Ilya Leoshkevich
2023-07-04  8:12 ` [PATCH v2 11/12] tests/tcg/s390x: Test MDEB and MDEBR Ilya Leoshkevich
2023-07-04  8:12 ` [PATCH v2 12/12] tests/tcg/s390x: Test MVCRL with a large value in R0 Ilya Leoshkevich

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=20230704081506.276055-5-iii@linux.ibm.com \
    --to=iii@linux.ibm.com \
    --cc=david@redhat.com \
    --cc=laurent@vivier.eu \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=qemu-stable@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).