diff options
| author | Kinglong Mee <kinglongmee@gmail.com> | 2015-03-26 11:23:17 -0400 |
|---|---|---|
| committer | Steve Dickson <steved@redhat.com> | 2015-03-26 11:28:54 -0400 |
| commit | 81aed045d3057a44b3aabf946bad2894be64dda7 (patch) | |
| tree | a0b03ef72de31b5e693e6559aa1c1c8599c6518f /utils/blkmapd/device-inq.c | |
| parent | 9128433947479d8eb9ea08fae2b79670d30b5cfa (diff) | |
| download | nfs-utils-81aed045d3057a44b3aabf946bad2894be64dda7.tar.gz nfs-utils-81aed045d3057a44b3aabf946bad2894be64dda7.tar.xz nfs-utils-81aed045d3057a44b3aabf946bad2894be64dda7.zip | |
blkmapd: Make sure device root contains valid device id
When testing pnfs in virtual linux based on VirtualBox,
blkmapd gets dev_root->len == 0, which causes it Segmentation fault.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Kinglong Mee <kinglongmee@gmail.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
Diffstat (limited to 'utils/blkmapd/device-inq.c')
| -rw-r--r-- | utils/blkmapd/device-inq.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/utils/blkmapd/device-inq.c b/utils/blkmapd/device-inq.c index eabc70c..c5bf71f 100644 --- a/utils/blkmapd/device-inq.c +++ b/utils/blkmapd/device-inq.c @@ -179,6 +179,7 @@ struct bl_serial *bldev_read_serial(int fd, const char *filename) char *buffer; struct bl_dev_id *dev_root, *dev_id; unsigned int pos, len, current_id = 0; + size_t devid_len = sizeof(struct bl_dev_id) - sizeof(unsigned char); status = bldev_inquire_pages(fd, 0x83, &buffer); if (status) @@ -189,7 +190,11 @@ struct bl_serial *bldev_read_serial(int fd, const char *filename) pos = 0; current_id = 0; len = dev_root->len; - while (pos < (len - sizeof(struct bl_dev_id) + sizeof(unsigned char))) { + + if (len < devid_len) + goto out; + + while (pos < (len - devid_len)) { dev_id = (struct bl_dev_id *)&(dev_root->data[pos]); if ((dev_id->ids & 0xf) < current_id) continue; @@ -221,8 +226,7 @@ struct bl_serial *bldev_read_serial(int fd, const char *filename) } if (current_id == 3) break; - pos += (dev_id->len + sizeof(struct bl_dev_id) - - sizeof(unsigned char)); + pos += (dev_id->len + devid_len); } out: if (!serial_out) |