Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2045e88e authored by Milan Broz's avatar Milan Broz Committed by Alasdair G Kergon
Browse files

dm log: move region_size validation 



Move log size validation from mirror target to log constructor.

Removed PAGE_SIZE restriction we no longer think necessary.

Signed-off-by: default avatarMilan Broz <mbroz@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 6f3af01c

drivers/md/dm-log.c

+14 −2
Original line number Original line Diff line number Diff line
@@ -360,6 +360,17 @@ static int read_header(struct log_c *log) 
	return 0;

	return 0;

}

}





static int _check_region_size(struct dm_target *ti, uint32_t region_size)

{

	if (region_size < 2 || region_size > ti->len)

		return 0;



	if (!is_power_of_2(region_size))

		return 0;



	return 1;

}



/*----------------------------------------------------------------

/*----------------------------------------------------------------

 * core log constructor/destructor

 * core log constructor/destructor

 *

 *
@@ -395,8 +406,9 @@ static int create_log_context(struct dm_dirty_log *log, struct dm_target *ti, 
		}

		}

	}

	}





	if (sscanf(argv[0], "%u", &region_size) != 1) {

	if (sscanf(argv[0], "%u", &region_size) != 1 ||

		DMWARN("invalid region size string");

	    !_check_region_size(ti, region_size)) {

		DMWARN("invalid region size %s", argv[0]);

		return -EINVAL;

		return -EINVAL;

	}

	}

drivers/md/dm-raid1.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -808,12 +808,6 @@ static void free_context(struct mirror_set *ms, struct dm_target *ti, 
	kfree(ms);

	kfree(ms);

}

}





static inline int _check_region_size(struct dm_target *ti, uint32_t size)

{

	return !(size % (PAGE_SIZE >> 9) || !is_power_of_2(size) ||

		 size > ti->len);

}



static int get_mirror(struct mirror_set *ms, struct dm_target *ti,

static int get_mirror(struct mirror_set *ms, struct dm_target *ti,

		      unsigned int mirror, char **argv)

		      unsigned int mirror, char **argv)

{

{
@@ -872,12 +866,6 @@ static struct dm_dirty_log *create_dirty_log(struct dm_target *ti, 
		return NULL;

		return NULL;

	}

	}





	if (!_check_region_size(ti, dl->type->get_region_size(dl))) {

		ti->error = "Invalid region size";

		dm_dirty_log_destroy(dl);

		return NULL;

	}



	return dl;

	return dl;

}

}