diff options
author | Lixiaokeng <lixiaokeng@huawei.com> | 2022-10-24 13:00:50 -0400 |
---|---|---|
committer | Steve Dickson <steved@redhat.com> | 2022-10-24 13:35:38 -0400 |
commit | c1c35487aba2cec828d9b8a1be9043000beadea5 (patch) | |
tree | 29a2b8663058e17da8dab153d72198980f77c0bf | |
parent | 809e8174c12e58ee5913e594a5548fe131240f71 (diff) | |
download | nfs-utils-c1c35487aba2cec828d9b8a1be9043000beadea5.tar.gz |
blkmapd: fix coredump in bl_add_disk
The serial->data is not malloced separately (just part of
the serial), so it can't be freed. The bl_serial has its
own free function. Use it.
Signed-off-by: Lixiaokeng <lixiaokeng@huawei.com>
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
-rw-r--r-- | utils/blkmapd/device-discovery.c | 15 | ||||
-rw-r--r-- | utils/blkmapd/device-discovery.h | 2 | ||||
-rw-r--r-- | utils/blkmapd/device-inq.c | 4 |
3 files changed, 7 insertions, 14 deletions
diff --git a/utils/blkmapd/device-discovery.c b/utils/blkmapd/device-discovery.c index 49935c2..bd89059 100644 --- a/utils/blkmapd/device-discovery.c +++ b/utils/blkmapd/device-discovery.c @@ -187,10 +187,7 @@ static void bl_add_disk(char *filepath) } if (disk && diskpath) { - if (serial) { - free(serial->data); - free(serial); - } + bl_free_scsi_string(serial); return; } @@ -228,10 +225,7 @@ static void bl_add_disk(char *filepath) disk->size = size; disk->valid_path = path; } - if (serial) { - free(serial->data); - free(serial); - } + bl_free_scsi_string(serial); } return; @@ -241,10 +235,7 @@ static void bl_add_disk(char *filepath) free(path->full_path); free(path); } - if (serial) { - free(serial->data); - free(serial); - } + bl_free_scsi_string(serial); return; } diff --git a/utils/blkmapd/device-discovery.h b/utils/blkmapd/device-discovery.h index a86eed9..462aa94 100644 --- a/utils/blkmapd/device-discovery.h +++ b/utils/blkmapd/device-discovery.h @@ -151,6 +151,8 @@ uint64_t process_deviceinfo(const char *dev_addr_buf, extern ssize_t atomicio(ssize_t(*f) (int, void *, size_t), int fd, void *_s, size_t n); +extern struct bl_serial *bl_create_scsi_string(int len, const char *bytes); +extern void bl_free_scsi_string(struct bl_serial *str); extern struct bl_serial *bldev_read_serial(int fd, const char *filename); extern enum bl_path_state_e bldev_read_ap_state(int fd); extern int bl_discover_devices(void); diff --git a/utils/blkmapd/device-inq.c b/utils/blkmapd/device-inq.c index c7952c3..9e5749e 100644 --- a/utils/blkmapd/device-inq.c +++ b/utils/blkmapd/device-inq.c @@ -53,7 +53,7 @@ #define DEF_ALLOC_LEN 255 #define MX_ALLOC_LEN (0xc000 + 0x80) -static struct bl_serial *bl_create_scsi_string(int len, const char *bytes) +struct bl_serial *bl_create_scsi_string(int len, const char *bytes) { struct bl_serial *s; @@ -66,7 +66,7 @@ static struct bl_serial *bl_create_scsi_string(int len, const char *bytes) return s; } -static void bl_free_scsi_string(struct bl_serial *str) +void bl_free_scsi_string(struct bl_serial *str) { if (str) free(str); |