Commit ae0b7448 authored by Mikulas Patocka's avatar Mikulas Patocka Committed by Alasdair G Kergon

dm snapshot: fix on disk chunk size validation

Fix some problems seen in the chunk size processing when activating a
pre-existing snapshot.

For a new snapshot, the chunk size can either be supplied by the creator
or a default value can be used.  For an existing snapshot, the
chunk size in the snapshot header on disk should always be used.

If someone attempts to load an existing snapshot and has the 'default
chunk size' option set, the kernel uses its default value even when it
is incorrect for the snapshot being loaded.  This patch ensures the
correct on-disk value is always used.

Secondly, when the code does use the chunk size stored on the disk it is
prudent to revalidate it, so the code can exit cleanly if it got
corrupted as happened in
https://bugzilla.redhat.com/show_bug.cgi?id=461506 .

Cc: stable@kernel.org
Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent 2defcc3f
...@@ -191,6 +191,11 @@ int dm_exception_store_set_chunk_size(struct dm_exception_store *store, ...@@ -191,6 +191,11 @@ int dm_exception_store_set_chunk_size(struct dm_exception_store *store,
return -EINVAL; return -EINVAL;
} }
if (chunk_size_ulong > INT_MAX >> SECTOR_SHIFT) {
*error = "Chunk size is too high";
return -EINVAL;
}
store->chunk_size = chunk_size_ulong; store->chunk_size = chunk_size_ulong;
store->chunk_mask = chunk_size_ulong - 1; store->chunk_mask = chunk_size_ulong - 1;
store->chunk_shift = ffs(chunk_size_ulong) - 1; store->chunk_shift = ffs(chunk_size_ulong) - 1;
......
...@@ -286,6 +286,7 @@ static int read_header(struct pstore *ps, int *new_snapshot) ...@@ -286,6 +286,7 @@ static int read_header(struct pstore *ps, int *new_snapshot)
struct disk_header *dh; struct disk_header *dh;
chunk_t chunk_size; chunk_t chunk_size;
int chunk_size_supplied = 1; int chunk_size_supplied = 1;
char *chunk_err;
/* /*
* Use default chunk size (or hardsect_size, if larger) if none supplied * Use default chunk size (or hardsect_size, if larger) if none supplied
...@@ -329,20 +330,25 @@ static int read_header(struct pstore *ps, int *new_snapshot) ...@@ -329,20 +330,25 @@ static int read_header(struct pstore *ps, int *new_snapshot)
ps->version = le32_to_cpu(dh->version); ps->version = le32_to_cpu(dh->version);
chunk_size = le32_to_cpu(dh->chunk_size); chunk_size = le32_to_cpu(dh->chunk_size);
if (!chunk_size_supplied || ps->store->chunk_size == chunk_size) if (ps->store->chunk_size == chunk_size)
return 0; return 0;
DMWARN("chunk size %llu in device metadata overrides " if (chunk_size_supplied)
"table chunk size of %llu.", DMWARN("chunk size %llu in device metadata overrides "
(unsigned long long)chunk_size, "table chunk size of %llu.",
(unsigned long long)ps->store->chunk_size); (unsigned long long)chunk_size,
(unsigned long long)ps->store->chunk_size);
/* We had a bogus chunk_size. Fix stuff up. */ /* We had a bogus chunk_size. Fix stuff up. */
free_area(ps); free_area(ps);
ps->store->chunk_size = chunk_size; r = dm_exception_store_set_chunk_size(ps->store, chunk_size,
ps->store->chunk_mask = chunk_size - 1; &chunk_err);
ps->store->chunk_shift = ffs(chunk_size) - 1; if (r) {
DMERR("invalid on-disk chunk size %llu: %s.",
(unsigned long long)chunk_size, chunk_err);
return r;
}
r = dm_io_client_resize(sectors_to_pages(ps->store->chunk_size), r = dm_io_client_resize(sectors_to_pages(ps->store->chunk_size),
ps->io_client); ps->io_client);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment