qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Dr. David Alan Gilbert (git)" <dgilbert@redhat.com>
To: qemu-devel@nongnu.org, kuhn.chenqun@huawei.com,
	zhengchuan@huawei.com, lihaotian9@huawei.com,
	longpeng2@huawei.com, liangpeng10@huawei.com, philmd@redhat.com,
	liuzhiqiang26@huawei.com
Cc: stefanha@redhat.com, quintela@redhat.com
Subject: [PULL 10/11] virtiofsd: check whether lo_map_reserve returns NULL in, main func
Date: Thu, 12 Nov 2020 18:37:57 +0000	[thread overview]
Message-ID: <20201112183758.203176-11-dgilbert@redhat.com> (raw)
In-Reply-To: <20201112183758.203176-1-dgilbert@redhat.com>

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



  parent reply	other threads:[~2020-11-12 18:44 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-12 18:37 [PULL 00/11] migration queue Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 01/11] migration/ram: Fix hexadecimal format string specifier Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 02/11] ACPI: Avoid infinite recursion when dump-vmstate Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 03/11] migration/multifd: fix hangup with TLS-Multifd due to blocking handshake Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 04/11] migration: fix uninitialized variable warning in migrate_send_rp_req_pages() Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 05/11] migration/dirtyrate: simplify includes in dirtyrate.c Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 06/11] multifd/tls: fix memoryleak of the QIOChannelSocket object when cancelling migration Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 07/11] migration: handle CANCELLING state in migration_completion() Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [PULL 08/11] virtiofsd: Announce submounts even without statx() Dr. David Alan Gilbert (git)
2020-11-12 18:37 ` [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 18:37 ` Dr. David Alan Gilbert (git) [this message]
2020-11-12 18:37 ` [PULL 11/11] virtiofsd: check whether strdup lo.source return NULL in main func Dr. David Alan Gilbert (git)
2020-11-13 10:49 ` [PULL 00/11] migration queue Peter Maydell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201112183758.203176-11-dgilbert@redhat.com \
    --to=dgilbert@redhat.com \
    --cc=kuhn.chenqun@huawei.com \
    --cc=liangpeng10@huawei.com \
    --cc=lihaotian9@huawei.com \
    --cc=liuzhiqiang26@huawei.com \
    --cc=longpeng2@huawei.com \
    --cc=philmd@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=quintela@redhat.com \
    --cc=stefanha@redhat.com \
    --cc=zhengchuan@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).