[BUG] disk_free_ptbl_rcu_cb() crash
From: Eric Dumazet
Date: Sat Oct 23 2010 - 17:10:17 EST
Current Linus tree makes my machine crash in disk_free_ptbl_rcu_cb(),
while booting...
commit 7681bfeeccff5ef seems the problem ?
Following patch solves the NULL dereference, but this is only to show
you where the problem is, not a real fix, of course.
Thanks
block/genhd.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/block/genhd.c b/block/genhd.c
index a8adf96..b63d401 100644
--- a/block/genhd.c
+++ b/block/genhd.c
@@ -930,14 +930,16 @@ static void disk_free_ptbl_rcu_cb(struct rcu_head *head)
struct disk_part_tbl *ptbl =
container_of(head, struct disk_part_tbl, rcu_head);
struct gendisk *disk = ptbl->disk;
- struct request_queue *q = disk->queue;
+ struct request_queue *q = disk ? disk->queue : NULL;
unsigned long flags;
kfree(ptbl);
- spin_lock_irqsave(q->queue_lock, flags);
- elv_quiesce_end(q);
- spin_unlock_irqrestore(q->queue_lock, flags);
+ if (q) {
+ spin_lock_irqsave(q->queue_lock, flags);
+ elv_quiesce_end(q);
+ spin_unlock_irqrestore(q->queue_lock, flags);
+ }
}
/**
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/