Skip to content

Commit 1b5520a

Browse files
cohuckmdroth
authored andcommittedSep 28, 2016
s390x/css: handle cssid 255 correctly
The cssid 255 is reserved but still valid from an architectural point of view. However, feeding a bogus schid of 0xffffffff into the virtio hypercall will lead to a crash: Stack trace of thread 138363: #0 0x00000000100d168c css_find_subch (qemu-system-s390x) #1 0x00000000100d3290 virtio_ccw_hcall_notify #2 0x00000000100cbf60 s390_virtio_hypercall #3 0x000000001010ff7a handle_hypercall #4 0x0000000010079ed4 kvm_cpu_exec (qemu-system-s390x) #5 0x00000000100609b4 qemu_kvm_cpu_thread_fn #6 0x000003ff8b887bb4 start_thread (libpthread.so.0) #7 0x000003ff8b78df0a thread_start (libc.so.6) This is because the css array was only allocated for 0..254 instead of 0..255. Let's fix this by bumping MAX_CSSID to 255 and fencing off the reserved cssid of 255 during css image allocation. Reported-by: Christian Borntraeger <borntraeger@de.ibm.com> Tested-by: Christian Borntraeger <borntraeger@de.ibm.com> Cc: qemu-stable@nongnu.org Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com> (cherry picked from commit 882b3b9) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
1 parent 9ea7a46 commit 1b5520a

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed
 

‎hw/s390x/css.c

+3-5
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,8 @@ int map_indicator(AdapterInfo *adapter, IndAddr *indicator)
139139
int css_create_css_image(uint8_t cssid, bool default_image)
140140
{
141141
trace_css_new_image(cssid, default_image ? "(default)" : "");
142-
if (cssid > MAX_CSSID) {
142+
/* 255 is reserved */
143+
if (cssid == 255) {
143144
return -EINVAL;
144145
}
145146
if (channel_subsys.css[cssid]) {
@@ -1226,7 +1227,7 @@ bool css_schid_final(int m, uint8_t cssid, uint8_t ssid, uint16_t schid)
12261227
uint8_t real_cssid;
12271228

12281229
real_cssid = (!m && (cssid == 0)) ? channel_subsys.default_cssid : cssid;
1229-
if (real_cssid > MAX_CSSID || ssid > MAX_SSID ||
1230+
if (ssid > MAX_SSID ||
12301231
!channel_subsys.css[real_cssid] ||
12311232
!channel_subsys.css[real_cssid]->sch_set[ssid]) {
12321233
return true;
@@ -1241,9 +1242,6 @@ static int css_add_virtual_chpid(uint8_t cssid, uint8_t chpid, uint8_t type)
12411242
CssImage *css;
12421243

12431244
trace_css_chpid_add(cssid, chpid, type);
1244-
if (cssid > MAX_CSSID) {
1245-
return -EINVAL;
1246-
}
12471245
css = channel_subsys.css[cssid];
12481246
if (!css) {
12491247
return -EINVAL;

‎hw/s390x/css.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
/* Channel subsystem constants. */
2020
#define MAX_SCHID 65535
2121
#define MAX_SSID 3
22-
#define MAX_CSSID 254 /* 255 is reserved */
22+
#define MAX_CSSID 255
2323
#define MAX_CHPID 255
2424

2525
#define MAX_CIWS 62

0 commit comments

Comments
 (0)
Please sign in to comment.