lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[S390] tape: fix dbf usage

Browse Source 
Get rid of the format string "%s" usage with volatile strings
to prevent use after free errors in the s390dbf.

Signed-off-by: Sebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Sebastian Ott
2010-10-29 16:50:44 +02:00
committed by Martin Schwidefsky
parent 196339f173
commit f2166bb117
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/s390/char/tape_core.c
View File

@@ -1077,15 +1077,14 @@ __tape_do_irq (struct ccw_device *cdev, unsigned long intparm, struct irb *irb)
/* FIXME: What to do with the request? */ /* FIXME: What to do with the request? */
switch (PTR_ERR(irb)) { switch (PTR_ERR(irb)) {
case -ETIMEDOUT: case -ETIMEDOUT:
DBF_LH(1, "(%s): Request timed out\n", DBF_LH(1, "(%08x): Request timed out\n",
dev_name(&cdev->dev)); device->cdev_id);
case -EIO: case -EIO:
__tape_end_request(device, request, -EIO); __tape_end_request(device, request, -EIO);
break; break;
default: default:
DBF_LH(1, "(%s): Unexpected i/o error %li\n", DBF_LH(1, "(%08x): Unexpected i/o error %li\n",
dev_name(&cdev->dev), device->cdev_id, PTR_ERR(irb));
PTR_ERR(irb));
} }
return; return;
} }

4
drivers/s390/char/tape_std.c
View File

@@ -47,8 +47,8 @@ tape_std_assign_timeout(unsigned long data)
device->cdev_id); device->cdev_id);
rc = tape_cancel_io(device, request); rc = tape_cancel_io(device, request);
if(rc) if(rc)
DBF_EVENT(3, "(%s): Assign timeout: Cancel failed with rc = %i\n", DBF_EVENT(3, "(%08x): Assign timeout: Cancel failed with rc = "
dev_name(&device->cdev->dev), rc); "%i\n", device->cdev_id, rc);
} }
int int