diff options
| author | Wenchao Hao <haowenchao@huawei.com> | 2020-11-23 21:57:29 +0800 |
|---|---|---|
| committer | Wenchao Hao <haowenchao@huawei.com> | 2020-12-12 11:43:53 +0800 |
| commit | d18fd867116ba503fc1ba684469b30c07e41ee45 (patch) | |
| tree | 62d7738c32bdf746e6a4a290110f98bfe4a72978 /utils | |
| parent | 3eac1fc3f512302b6eccd913cbc9e7dc1f490ed2 (diff) | |
| download | open-iscsi-d18fd867116ba503fc1ba684469b30c07e41ee45.tar.gz | |
iscsi-iname: Verify open() return value before calling read()
System call open() might return -1 if an error occurred which
should be taken into consideration.
Signed-off-by: Wenchao Hao <haowenchao@huawei.com>
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
Signed-off-by: Wu Bo <wubo40@huawei.com>
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/iscsi-iname.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/utils/iscsi-iname.c b/utils/iscsi-iname.c index 0f587e1..834352e 100644 --- a/utils/iscsi-iname.c +++ b/utils/iscsi-iname.c @@ -96,7 +96,8 @@ main(int argc, char *argv[]) * uniqueness properties */ - if ((fd = open(RANDOM_NUM_GENERATOR, O_RDONLY))) { + fd = open(RANDOM_NUM_GENERATOR, O_RDONLY); + if (fd != -1) { e = read(fd, &entropy, 16); if (e >= 1) MD5Update(&context, (md5byte *)entropy, e); @@ -141,7 +142,8 @@ main(int argc, char *argv[]) * good as any other). */ - if ((fd = open(RANDOM_NUM_GENERATOR, O_RDONLY))) { + fd = open(RANDOM_NUM_GENERATOR, O_RDONLY); + if (fd != -1) { if (read(fd, entropy, 1) == 1) bytes = &digest[(entropy[0] % (sizeof(digest) - 6))]; close(fd); |