[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 10/11] virtiofsd: check whether lo_map_reserve returns NULL in, ma
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 10/11] virtiofsd: check whether lo_map_reserve returns NULL in, main func |
Date: |
Thu, 12 Nov 2020 18:37:57 +0000 |
From: Haotian Li <lihaotian9@huawei.com>
In main func, func lo_map_reserve is called without NULL check.
If reallocing new_elems fails in func lo_map_grow, the func
lo_map_reserve may return NULL. We should check whether
lo_map_reserve returns NULL before using it.
Signed-off-by: Haotian Li <lihaotian9@huawei.com>
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
Message-Id: <48887813-1c95-048c-6d10-48e3dd2bac71@huawei.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
tools/virtiofsd/passthrough_ll.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index 6c64b03f1a..9545a0d174 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -3425,6 +3425,7 @@ int main(int argc, char *argv[])
.proc_self_fd = -1,
};
struct lo_map_elem *root_elem;
+ struct lo_map_elem *reserve_elem;
int ret = -1;
/* Don't mask creation mode, kernel already did that */
@@ -3444,8 +3445,17 @@ int main(int argc, char *argv[])
* [1] Root inode
*/
lo_map_init(&lo.ino_map);
- lo_map_reserve(&lo.ino_map, 0)->in_use = false;
+ reserve_elem = lo_map_reserve(&lo.ino_map, 0);
+ if (!reserve_elem) {
+ fuse_log(FUSE_LOG_ERR, "failed to alloc reserve_elem.\n");
+ goto err_out1;
+ }
+ reserve_elem->in_use = false;
root_elem = lo_map_reserve(&lo.ino_map, lo.root.fuse_ino);
+ if (!root_elem) {
+ fuse_log(FUSE_LOG_ERR, "failed to alloc root_elem.\n");
+ goto err_out1;
+ }
root_elem->inode = &lo.root;
lo_map_init(&lo.dirp_map);
--
2.28.0
- [PULL 00/11] migration queue, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 01/11] migration/ram: Fix hexadecimal format string specifier, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 02/11] ACPI: Avoid infinite recursion when dump-vmstate, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 03/11] migration/multifd: fix hangup with TLS-Multifd due to blocking handshake, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 04/11] migration: fix uninitialized variable warning in migrate_send_rp_req_pages(), Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 05/11] migration/dirtyrate: simplify includes in dirtyrate.c, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 06/11] multifd/tls: fix memoryleak of the QIOChannelSocket object when cancelling migration, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 08/11] virtiofsd: Announce submounts even without statx(), Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 07/11] migration: handle CANCELLING state in migration_completion(), Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 09/11] tools/virtiofsd/buffer.c: check whether buf is NULL in fuse_bufvec_advance func, Dr. David Alan Gilbert (git), 2020/11/12
- [PULL 10/11] virtiofsd: check whether lo_map_reserve returns NULL in, main func,
Dr. David Alan Gilbert (git) <=
- [PULL 11/11] virtiofsd: check whether strdup lo.source return NULL in main func, Dr. David Alan Gilbert (git), 2020/11/12
- Re: [PULL 00/11] migration queue, Peter Maydell, 2020/11/13