2006-03-22 15:24:35

by Martin Schwidefsky

[permalink] [raw]
Subject: [patch 18/24] s390: tape operation abortion leads to panic

From: Michael Holzheu <[email protected]>

[patch 18/24] s390: tape operation abortion leads to panic

When a request is aborted because of a signal, we currently stop the request
via csh, but we do not wait for the interrupt of csh in any case. We free the
request structure and therefore when the interrupt for the csh operation is
presented, the request object is no longer valid and an invalid callback
pointer is used.
To fix this wait until the interrupt for csh arrives and until
wait_event_interruptible() does not return -ERESTARTSYS.

Signed-off-by: Michael Holzheu <[email protected]>
Signed-off-by: Martin Schwidefsky <[email protected]>
---

drivers/s390/char/tape_core.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)

diff -urpN linux-2.6/drivers/s390/char/tape_core.c linux-2.6-patched/drivers/s390/char/tape_core.c
--- linux-2.6/drivers/s390/char/tape_core.c 2006-03-22 14:36:33.000000000 +0100
+++ linux-2.6-patched/drivers/s390/char/tape_core.c 2006-03-22 14:36:33.000000000 +0100
@@ -1015,7 +1015,7 @@ tape_do_io_interruptible(struct tape_dev
wq,
(request->callback == NULL)
);
- } while (rc != -ERESTARTSYS);
+ } while (rc == -ERESTARTSYS);

DBF_EVENT(3, "IO stopped on %08x\n", device->cdev_id);
rc = -ERESTARTSYS;