diff options
| author | Jes Sorensen <jsorensen@fb.com> | 2021-04-14 11:15:07 -0400 |
|---|---|---|
| committer | Jes Sorensen <jsorensen@fb.com> | 2021-04-14 11:16:03 -0400 |
| commit | aec016303bfa65ff5fac679698f3d47eeca3d823 (patch) | |
| tree | aad9c607a728094d9ad9b030510cc0d3460df06a | |
| parent | 78c93b006e6127e62ca62adfb107c13fe5429386 (diff) | |
| download | mdadm-aec016303bfa65ff5fac679698f3d47eeca3d823.tar.gz | |
super-intel.c: Handle errors from calls to get_dev_sector_size()
The compiler gets rather upset if we do not take care of this.
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
| -rw-r--r-- | super-intel.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/super-intel.c b/super-intel.c index 6617dd6d..876e077c 100644 --- a/super-intel.c +++ b/super-intel.c @@ -5213,7 +5213,10 @@ static int get_super_block(struct intel_super **super_list, char *devnm, char *d goto error; } - get_dev_sector_size(dfd, NULL, &s->sector_size); + if (!get_dev_sector_size(dfd, NULL, &s->sector_size)) { + err = 2; + goto error; + } find_intel_hba_capability(dfd, s, devname); err = load_and_parse_mpb(dfd, s, NULL, keep_fd); @@ -5292,7 +5295,8 @@ static int load_super_imsm(struct supertype *st, int fd, char *devname) free_super_imsm(st); super = alloc_super(); - get_dev_sector_size(fd, NULL, &super->sector_size); + if (!get_dev_sector_size(fd, NULL, &super->sector_size)) + return 1; if (!super) return 1; /* Load hba and capabilities if they exist. @@ -6001,7 +6005,8 @@ static int add_to_super_imsm(struct supertype *st, mdu_disk_info_t *dk, } get_dev_size(fd, NULL, &size); - get_dev_sector_size(fd, NULL, &member_sector_size); + if (!get_dev_sector_size(fd, NULL, &member_sector_size)) + return 1; if (super->sector_size == 0) { /* this a first device, so sector_size is not set yet */ @@ -8882,7 +8887,8 @@ static int store_imsm_mpb(int fd, struct imsm_super *mpb) unsigned long long sectors; unsigned int sector_size; - get_dev_sector_size(fd, NULL, §or_size); + if (!get_dev_sector_size(fd, NULL, §or_size)) + return 1; get_dev_size(fd, NULL, &dsize); if (mpb_size > sector_size) { |