All of lore.kernel.org
 help / color / mirror / Atom feed
From: Christian Borntraeger <borntraeger@linux.ibm.com>
To: Cornelia Huck <cohuck@redhat.com>
Cc: qemu-devel <qemu-devel@nongnu.org>,
	qemu-s390x <qemu-s390x@nongnu.org>,
	Halil Pasic <pasic@linux.ibm.com>,
	Matthew Rosato <mjrosato@linux.ibm.com>,
	Eric Farman <farman@linux.ibm.com>,
	Christian Borntraeger <borntraeger@linux.ibm.com>,
	Jason Herne <jjherne@linux.ibm.com>,
	Richard Henderson <richard.henderson@linaro.org>,
	Ilya Leoshkevich <iii@linux.ibm.com>,
	David Hildenbrand <david@kernel.org>,
	qemu-stable@nongnu.org,
	Hendrik Brueckner <brueckner@linux.ibm.com>
Subject: [PATCH 1/5] s390x/sclp: reject invalid write event data headers
Date: Mon,  6 Jul 2026 11:19:05 +0200	[thread overview]
Message-ID: <20260706091909.864405-2-borntraeger@linux.ibm.com> (raw)
In-Reply-To: <20260706091909.864405-1-borntraeger@linux.ibm.com>

If a guest submits an sccb with a tiny header length but a large number
of event mask entries, the write_event_mask handler will
1. return the wrong RC (ok instead of error)
2. write to memory after the allocated sccb in qemu host memory.

Add the necessary checks.

Cc: qemu-stable@nongnu.org
Reviewed-by: Hendrik Brueckner <brueckner@linux.ibm.com>
Signed-off-by: Christian Borntraeger <borntraeger@linux.ibm.com>
---
 hw/s390x/event-facility.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index fee286ea63..184c469bd3 100644
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -286,6 +286,7 @@ static void read_event_data(SCLPEventFacility *ef, SCCB *sccb)
 static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)
 {
     WriteEventMask *we_mask = (WriteEventMask *) sccb;
+    uint16_t sccb_length = be16_to_cpu(sccb->h.length);
     uint16_t mask_length = be16_to_cpu(we_mask->mask_length);
     sccb_mask_t tmp_mask;
 
@@ -294,6 +295,11 @@ static void write_event_mask(SCLPEventFacility *ef, SCCB *sccb)
         return;
     }
 
+    if (sccb_length < sizeof(WriteEventMask) + 4 * mask_length) {
+        sccb->h.response_code = cpu_to_be16(SCLP_RC_INSUFFICIENT_SCCB_LENGTH);
+        return;
+    }
+
     /*
      * Note: We currently only support masks up to 8 byte length;
      *       the remainder is filled up with zeroes. Older Linux
-- 
2.53.0



  reply	other threads:[~2026-07-06  9:22 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-07-06  9:19 [PATCH 0/5] s390x: interface hardening fixes Christian Borntraeger
2026-07-06  9:19 ` Christian Borntraeger [this message]
2026-07-06 13:12   ` [PATCH 1/5] s390x/sclp: reject invalid write event data headers Matthew Rosato
2026-07-07  1:28   ` Eric Farman
2026-07-07  6:05   ` Philippe Mathieu-Daudé
2026-07-06  9:19 ` [PATCH 2/5] s390x/pci: Tighten region detection for BAR read/write Christian Borntraeger
2026-07-06 19:09   ` Farhan Ali
2026-07-06  9:19 ` [PATCH 3/5] s390x/pci: Shrink RPCIT ranges to registered window Christian Borntraeger
2026-07-06 19:07   ` Farhan Ali
2026-07-06  9:19 ` [PATCH 4/5] s390x/ioinst: Require strict length and format for SEI CHSC handler Christian Borntraeger
2026-07-06 19:08   ` Farhan Ali
2026-07-07  1:30   ` Eric Farman
2026-07-06  9:19 ` [PATCH 5/5] s390x/css: limit number of CHPIDs in description Christian Borntraeger
2026-07-06 17:49   ` Matthew Rosato
2026-07-06 15:13 ` [PATCH 0/5] s390x: interface hardening fixes Cornelia Huck
2026-07-06 16:31   ` Christian Borntraeger
2026-07-07  6:54     ` Cornelia Huck

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=20260706091909.864405-2-borntraeger@linux.ibm.com \
    --to=borntraeger@linux.ibm.com \
    --cc=brueckner@linux.ibm.com \
    --cc=cohuck@redhat.com \
    --cc=david@kernel.org \
    --cc=farman@linux.ibm.com \
    --cc=iii@linux.ibm.com \
    --cc=jjherne@linux.ibm.com \
    --cc=mjrosato@linux.ibm.com \
    --cc=pasic@linux.ibm.com \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-s390x@nongnu.org \
    --cc=qemu-stable@nongnu.org \
    --cc=richard.henderson@linaro.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.