diff options
author | Rainer Weikusat <rweikusat@mssgmbh.com> | 2009-06-18 11:04:00 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-06-20 06:22:47 -0400 |
commit | 39c58f37a10198054c656c28202fb1e6d22fd505 (patch) | |
tree | f0a321782a02f8fde4a68ffd8627771ff6be1e02 /drivers/ide/ide-cd.c | |
parent | 2c7eaa43c3bb7b3b9fe2051d17f308c1f0728c78 (diff) |
ide-cd: prevent null pointer deref via cdrom_newpc_intr
With 2.6.30, the error handling code in cdrom_newpc_intr was changed
to deal with partial request failures by normally completing the 'good'
parts of a request and only 'error' the last (and presumably,
incompletely transferred) bio associated with a particular
request. In order to do this, ide_complete_rq is called over
ide_cd_error_cmd() to partially complete the rq. The block layer
does partial completion only for requests with bio's and if the
rq doesn't have one (eg 'GPCMD_READ_DISC_INFO') the request is
completed as a whole and the drive->hwif->rq pointer set to NULL
afterwards. When calling ide_complete_rq again to report
the error, this null pointer is derefenced, resulting in a kernel
crash.
This fixes http://bugzilla.kernel.org/show_bug.cgi?id=13399.
Signed-off-by: Rainer Weikusat <rweikusat@mssgmbh.com>
Signed-off-by: Borislav Petkov <petkovbb@gmail.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-cd.c')
-rw-r--r-- | drivers/ide/ide-cd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/ide-cd.c b/drivers/ide/ide-cd.c index 0b7645b13df1..4a19686fcfe9 100644 --- a/drivers/ide/ide-cd.c +++ b/drivers/ide/ide-cd.c | |||
@@ -667,7 +667,7 @@ out_end: | |||
667 | rq->errors = -EIO; | 667 | rq->errors = -EIO; |
668 | } | 668 | } |
669 | 669 | ||
670 | if (uptodate == 0) | 670 | if (uptodate == 0 && rq->bio) |
671 | ide_cd_error_cmd(drive, cmd); | 671 | ide_cd_error_cmd(drive, cmd); |
672 | 672 | ||
673 | /* make sure it's fully ended */ | 673 | /* make sure it's fully ended */ |