diff options
| author | Boaz Harrosh <bharrosh@panasas.com> | 2009-03-24 12:35:07 +0100 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-03-26 11:01:23 +0100 |
| commit | 1cd96c242a829d52f7a5ae98f554ca9775429685 (patch) | |
| tree | 018d3ab9fa0d6e2bcd739483ac2693f6f71db96b /block/blk-merge.c | |
| parent | f028f3b2f987ebc61cef382ab7a5c449917b728e (diff) | |
| download | linux-stable-1cd96c242a829d52f7a5ae98f554ca9775429685.tar.gz linux-stable-1cd96c242a829d52f7a5ae98f554ca9775429685.tar.bz2 linux-stable-1cd96c242a829d52f7a5ae98f554ca9775429685.zip | |
block: WARN in __blk_put_request() for potential bio leak
Put a WARN_ON in __blk_put_request if it is about to
leak bio(s). This is a serious bug that can happen in error
handling code paths.
For this to work I have fixed a couple of places in block/ where
request->bio != NULL ownership was not honored. And a small cleanup
at sg_io() while at it.
Signed-off-by: Boaz Harrosh <bharrosh@panasas.com>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 5a244f05360f..e39cb24b7679 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -403,6 +403,8 @@ static int attempt_merge(struct request_queue *q, struct request *req, if (blk_rq_cpu_valid(next)) req->cpu = next->cpu; + /* owner-ship of bio passed from next to req */ + next->bio = NULL; __blk_put_request(q, next); return 1; } |