From f1f17dad5582a916a9376a397bc7b6c877ef670a Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Wed, 20 Feb 2019 08:19:13 +0100
Subject: [PATCH] dasd_fba: Display '00000000' for zero page when dumping sense
References: bsc#1123080
Patch-mainline: no, test patch for now
When a discard I/O fails, dasd_fba_dump_sense() will crash as it
tries to print out the CCW, and failing to take into account that
for discard I/O we have only one data pointer, not one per sg.
As the data pointer will always point to the zero page this patch
replaces the data pointer output with '00000000' to avoid the crash.
Signed-off-by: Hannes Reinecke <hare@suse.com>
[sparschauer: replaced "ccw" with "act", "snprintf" with "sprintf"]
[sparschauer v2: added missing curly braces to for loops]
Signed-off-by: Sebastian Parschauer <sparschauer@suse.de>
---
drivers/s390/block/dasd_fba.c | 21 ++++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 6168ccdb389c..a3f3778cf29f 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -714,10 +714,15 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
" CCW %p: %08X %08X DAT:",
act, ((int *) act)[0], ((int *) act)[1]);
for (count = 0; count < 32 && count < act->count;
- count += sizeof(int))
+ count += sizeof(int)) {
+ if (act->flags & CCW_FLAG_SLI) {
+ len += sprintf(page + len, " 00000000");
+ break;
+ }
len += sprintf(page + len, " %08X",
((int *) (addr_t) act->cda)
[(count>>2)]);
+ }
len += sprintf(page + len, "\n");
act++;
}
@@ -736,10 +741,15 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
" CCW %p: %08X %08X DAT:",
act, ((int *) act)[0], ((int *) act)[1]);
for (count = 0; count < 32 && count < act->count;
- count += sizeof(int))
+ count += sizeof(int)) {
+ if (act->flags & CCW_FLAG_SLI) {
+ len += sprintf(page + len, " 00000000");
+ break;
+ }
len += sprintf(page + len, " %08X",
((int *) (addr_t) act->cda)
[(count>>2)]);
+ }
len += sprintf(page + len, "\n");
act++;
}
@@ -754,10 +764,15 @@ dasd_fba_dump_sense(struct dasd_device *device, struct dasd_ccw_req * req,
" CCW %p: %08X %08X DAT:",
act, ((int *) act)[0], ((int *) act)[1]);
for (count = 0; count < 32 && count < act->count;
- count += sizeof(int))
+ count += sizeof(int)) {
+ if (act->flags & CCW_FLAG_SLI) {
+ len += sprintf(page + len, " 00000000");
+ break;
+ }
len += sprintf(page + len, " %08X",
((int *) (addr_t) act->cda)
[(count>>2)]);
+ }
len += sprintf(page + len, "\n");
act++;
}
--
2.22.0