diff options
| author | Mariusz Tkaczyk <mariusz.tkaczyk@intel.com> | 2019-04-01 16:53:41 +0200 |
|---|---|---|
| committer | Jes Sorensen <jsorensen@fb.com> | 2019-04-10 15:39:34 +0200 |
| commit | 22dc741f63e6403d59c2c14f56fd4791265f9bbb (patch) | |
| tree | 3e773e90e46328f895081d6cad614e6311324cfe /Create.c | |
| parent | imsm: fix spare activation for old matrix arrays (diff) | |
| download | mdadm-22dc741f63e6403d59c2c14f56fd4791265f9bbb.tar.xz mdadm-22dc741f63e6403d59c2c14f56fd4791265f9bbb.zip | |
Create: Block rounding size to max
When passed size is smaller than chunk, mdadm rounds it to 0 but 0 there
means max available space.
Block it for every metadata. Remove the same check from imsm routine.
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@intel.com>
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
Diffstat (limited to 'Create.c')
| -rw-r--r-- | Create.c | 23 |
1 files changed, 20 insertions, 3 deletions
@@ -27,6 +27,18 @@ #include "md_p.h" #include <ctype.h> +static int round_size_and_verify(unsigned long long *size, int chunk) +{ + if (*size == 0) + return 0; + *size &= ~(unsigned long long)(chunk - 1); + if (*size == 0) { + pr_err("Size cannot be smaller than chunk.\n"); + return 1; + } + return 0; +} + static int default_layout(struct supertype *st, int level, int verbose) { int layout = UnSet; @@ -248,11 +260,14 @@ int Create(struct supertype *st, char *mddev, pr_err("unknown level %d\n", s->level); return 1; } + if (s->size == MAX_SIZE) /* use '0' to mean 'max' now... */ s->size = 0; if (s->size && s->chunk && s->chunk != UnSet) - s->size &= ~(unsigned long long)(s->chunk - 1); + if (round_size_and_verify(&s->size, s->chunk)) + return 1; + newsize = s->size * 2; if (st && ! st->ss->validate_geometry(st, s->level, s->layout, s->raiddisks, &s->chunk, s->size*2, @@ -267,7 +282,8 @@ int Create(struct supertype *st, char *mddev, /* default chunk was just set */ if (c->verbose > 0) pr_err("chunk size defaults to %dK\n", s->chunk); - s->size &= ~(unsigned long long)(s->chunk - 1); + if (round_size_and_verify(&s->size, s->chunk)) + return 1; do_default_chunk = 0; } } @@ -413,7 +429,8 @@ int Create(struct supertype *st, char *mddev, /* default chunk was just set */ if (c->verbose > 0) pr_err("chunk size defaults to %dK\n", s->chunk); - s->size &= ~(unsigned long long)(s->chunk - 1); + if (round_size_and_verify(&s->size, s->chunk)) + return 1; do_default_chunk = 0; } } |