Commit 39c58f37 authored by Rainer Weikusat's avatar Rainer Weikusat Committed by Bartlomiej Zolnierkiewicz

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: default avatarRainer Weikusat <rweikusat@mssgmbh.com>
Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 2c7eaa43
...@@ -667,7 +667,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive) ...@@ -667,7 +667,7 @@ static ide_startstop_t cdrom_newpc_intr(ide_drive_t *drive)
rq->errors = -EIO; rq->errors = -EIO;
} }
if (uptodate == 0) if (uptodate == 0 && rq->bio)
ide_cd_error_cmd(drive, cmd); ide_cd_error_cmd(drive, cmd);
/* make sure it's fully ended */ /* make sure it's fully ended */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment