[PATCH] block: validate parameters of exported functions

* [PATCH] block: validate parameters of exported functions
@ 2009-01-10  6:37 Németh Márton
  2009-01-10  6:47 ` Németh Márton
  0 siblings, 1 reply; 2+ messages in thread
From: Németh Márton @ 2009-01-10  6:37 UTC (permalink / raw)
  To: Jens Axboe; +Cc: LKML

From: Márton Németh <nm127@freemail.hu>

Check the parameters of the exported functions in genhd.c agains NULL.
The checks are done with BUG_ON() so they will only act if CONFIG_BUG=y.

Signed-off-by: Márton Németh <nm127@freemail.hu>
---

--- linux-2.6.28/block/genhd.c.orig	2008-12-25 00:26:37.000000000 +0100
+++ linux-2.6.28/block/genhd.c	2009-01-10 07:12:45.000000000 +0100
@@ -58,6 +58,7 @@ struct hd_struct *disk_get_part(struct g

 	if (unlikely(partno < 0))
 		return NULL;
+	BUG_ON(!disk);

 	rcu_read_lock();

@@ -90,6 +91,9 @@ void disk_part_iter_init(struct disk_par
 {
 	struct disk_part_tbl *ptbl;

+	BUG_ON(!piter);
+	BUG_ON(!disk);
+
 	rcu_read_lock();
 	ptbl = rcu_dereference(disk->part_tbl);

@@ -123,6 +127,8 @@ struct hd_struct *disk_part_iter_next(st
 	struct disk_part_tbl *ptbl;
 	int inc, end;

+	BUG_ON(!piter);
+
 	/* put the last partition */
 	disk_put_part(piter->part);
 	piter->part = NULL;
@@ -176,6 +182,7 @@ EXPORT_SYMBOL_GPL(disk_part_iter_next);
  */
 void disk_part_iter_exit(struct disk_part_iter *piter)
 {
+	BUG_ON(!piter);
 	disk_put_part(piter->part);
 	piter->part = NULL;
 }
@@ -201,6 +208,8 @@ struct hd_struct *disk_map_sector_rcu(st
 	struct disk_part_tbl *ptbl;
 	int i;

+	BUG_ON(!disk);
+
 	ptbl = rcu_dereference(disk->part_tbl);

 	for (i = 1; i < ptbl->len; i++) {
@@ -375,6 +384,9 @@ int blk_alloc_devt(struct hd_struct *par
 	struct gendisk *disk = part_to_disk(part);
 	int idx, rc;

+	BUG_ON(!part);
+	BUG_ON(!devt);
+
 	/* in consecutive minor range? */
 	if (part->partno < disk->minors) {
 		*devt = MKDEV(disk->major, disk->first_minor + part->partno);
@@ -487,6 +499,8 @@ void add_disk(struct gendisk *disk)
 	dev_t devt;
 	int retval;

+	BUG_ON(!disk);
+
 	/* minors == 0 indicates to use ext devt from part0 and should
 	 * be accompanied with EXT_DEVT flag.  Make sure all
 	 * parameters make sense.
@@ -526,6 +540,8 @@ EXPORT_SYMBOL(del_gendisk);	/* in partit

 void unlink_gendisk(struct gendisk *disk)
 {
+	BUG_ON(!disk);
+	BUG_ON(!disk->queue);
 	sysfs_remove_link(&disk_to_dev(disk)->kobj, "bdi");
 	bdi_unregister(&disk->queue->backing_dev_info);
 	blk_unregister_queue(disk);
@@ -544,6 +560,8 @@ struct gendisk *get_gendisk(dev_t devt,
 {
 	struct gendisk *disk = NULL;

+	BUG_ON(!partno);
+
 	if (MAJOR(devt) != BLOCK_EXT_MAJOR) {
 		struct kobject *kobj;

@@ -1127,6 +1145,8 @@ struct kobject *get_disk(struct gendisk
 	struct module *owner;
 	struct kobject *kobj;

+	BUG_ON(!disk);
+
 	if (!disk->fops)
 		return NULL;
 	owner = disk->fops->owner;
@@ -1153,6 +1173,7 @@ EXPORT_SYMBOL(put_disk);

 void set_device_ro(struct block_device *bdev, int flag)
 {
+	BUG_ON(!bdev);
 	bdev->bd_part->policy = flag;
 }


^ permalink raw reply	[flat|nested] 2+ messages in thread