فهرست منبع

rsxx: Fix possible kernel panic with invalid config.

This patch fixes a possible Kernel Panic on driver load if
the configuration on the card is messed up or not yet set.
The driver could possible give a 32 bit unsigned all Fs to
the kernel as the device's block size.

Now we only write the block size to the kernel if the
configuration from the card is valid.

Also, driver version is being updated.

Signed-off-by: Philip J Kelleher <pjk1939@linux.vnet.ibm.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Philip J Kelleher 12 سال پیش
والد
کامیت
8c49a77ca4
2فایلهای تغییر یافته به همراه6 افزوده شده و 4 حذف شده
  1. 5 3
      drivers/block/rsxx/dev.c
  2. 1 1
      drivers/block/rsxx/rsxx_priv.h

+ 5 - 3
drivers/block/rsxx/dev.c

@@ -295,13 +295,15 @@ int rsxx_setup_dev(struct rsxx_cardinfo *card)
 		return -ENOMEM;
 		return -ENOMEM;
 	}
 	}
 
 
-	blk_size = card->config.data.block_size;
+	if (card->config_valid) {
+		blk_size = card->config.data.block_size;
+		blk_queue_dma_alignment(card->queue, blk_size - 1);
+		blk_queue_logical_block_size(card->queue, blk_size);
+	}
 
 
 	blk_queue_make_request(card->queue, rsxx_make_request);
 	blk_queue_make_request(card->queue, rsxx_make_request);
 	blk_queue_bounce_limit(card->queue, BLK_BOUNCE_ANY);
 	blk_queue_bounce_limit(card->queue, BLK_BOUNCE_ANY);
-	blk_queue_dma_alignment(card->queue, blk_size - 1);
 	blk_queue_max_hw_sectors(card->queue, blkdev_max_hw_sectors);
 	blk_queue_max_hw_sectors(card->queue, blkdev_max_hw_sectors);
-	blk_queue_logical_block_size(card->queue, blk_size);
 	blk_queue_physical_block_size(card->queue, RSXX_HW_BLK_SIZE);
 	blk_queue_physical_block_size(card->queue, RSXX_HW_BLK_SIZE);
 
 
 	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, card->queue);
 	queue_flag_set_unlocked(QUEUE_FLAG_NONROT, card->queue);

+ 1 - 1
drivers/block/rsxx/rsxx_priv.h

@@ -52,7 +52,7 @@ struct proc_cmd;
 #define RS70_PCI_REV_SUPPORTED	4
 #define RS70_PCI_REV_SUPPORTED	4
 
 
 #define DRIVER_NAME "rsxx"
 #define DRIVER_NAME "rsxx"
-#define DRIVER_VERSION "4.0.2.2510"
+#define DRIVER_VERSION "4.0.3.2516"
 
 
 /* Block size is 4096 */
 /* Block size is 4096 */
 #define RSXX_HW_BLK_SHIFT		12
 #define RSXX_HW_BLK_SHIFT		12