[PATCH] blk: clear completion stack pointer on return

From: Jens Axboe <axboe@suse.de>

It doesn't always look safe to let ->waiting remain set when returning from
functions that set it to point to stack area, since various locations check
for != NULL to see if it's valid.  So clear it on return from
ide_do_drive_cmd() and blk_execute_rq().

diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c
index f3c9c06656adda072a87ed5a51c490f4614e840b..a9886f1fd207830cac596180525740b6d70f11c1 100644 (file)
--- a/drivers/block/ll_rw_blk.c
+++ b/drivers/block/ll_rw_blk.c
@@ -1876,6 +1876,7 @@ int blk_execute_rq(request_queue_t *q, struct gendisk *bd_disk,
        elv_add_request(q, rq, ELEVATOR_INSERT_BACK, 1);
        generic_unplug_device(q);
        wait_for_completion(&wait);
+       rq->waiting = NULL;
 
        if (rq->errors)
                err = -EIO;

diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c
index 8ae49745556234ea17fb392476c0c65fdcc63066..37f95e14be98f5c8192cb880b73ba7ffd1511d1e 100644 (file)
--- a/drivers/ide/ide-io.c
+++ b/drivers/ide/ide-io.c
@@ -1388,6 +1388,7 @@ int ide_do_drive_cmd (ide_drive_t *drive, struct request *rq, ide_action_t actio
        err = 0;
        if (must_wait) {
                wait_for_completion(&wait);
+               rq->waiting = NULL;
                if (rq->errors)
                        err = -EIO;