From: Timothy Thelin <Timothy.Thelin@wdc.com>
Date: Sat, 17 Sep 2005 02:28:16 +0000 (-0700)
Subject: [PATCH] ide: fix null request pointer for taskfile ioctl
X-Git-Tag: v2.6.14-rc2~5^2~15
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef0f6a437f92fbd96c725086555b37b29371e107;p=linux-2.6

[PATCH] ide: fix null request pointer for taskfile ioctl

When doing ioctl HDIO_DRIVE_TASKFILE, the ide_task_t's request pointer is
never set, but flagged_taskfile and do_rw_taskfile pass it as a parameter
to the prehandler.  The kernel will oops taskfile pio-out commands because
of this (taskfile pio-in doesn't use a prehandler).  This fix sets the
request pointer at the time the request is created to stop this oops.

Signed-off-by: Timothy Thelin <timothy.thelin@wdc.com>
Cc: "Bartlomiej Zolnierkiewicz" <bzolnier@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/drivers/ide/ide-taskfile.c b/drivers/ide/ide-taskfile.c
index d04f62ab5d..ace8edad6e 100644
--- a/drivers/ide/ide-taskfile.c
+++ b/drivers/ide/ide-taskfile.c
@@ -500,6 +500,7 @@ static int ide_diag_taskfile(ide_drive_t *drive, ide_task_t *args, unsigned long
 	}
 
 	rq.special = args;
+	args->rq = &rq;
 	return ide_do_drive_cmd(drive, &rq, ide_wait);
 }