From nobody Fri May 17 09:38:18 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) client-ip=216.205.24.124; envelope-from=philmd@redhat.com; helo=us-smtp-delivery-124.mimecast.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1604309025; cv=none; d=zohomail.com; s=zohoarc; b=FUkQJUPq3HD8VZApJb56FCRupQIPxoU2LRWD2d6JfXRTXrAOMLXAW+fXHrVnuNHLg0Fje4ij9mt6EiSbVULjXojWd+VNlHTeDJJ6b/aTJtU3c/ZNwEdfEDwrUBBfZRDDYJDLfvjxFF5OQdRyWNdRPvDsBWgRB2rOzZK02e8bxqI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604309025; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:MIME-Version:Message-ID:Subject:To; bh=oqaCBtiyHyraZrQbnp3YwL6DATj7zhKDy6uE+R2EKuw=; b=h6Cp4zKdmHZ0cpc6OY1x7lC+2pi6RMmoIScc6WaVqzgmF+XcLe5IC8/3QYmon86SQeop65t8CGLGDm2A1EWeCKodcT5zfLnXkQLoJRb1TuIot1iwKqKVlcwVFcDriCvoVKg3TvlG9J5l64dXmbJrgx/TjPo+R4m/CbAjAbXQLLg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of redhat.com designates 216.205.24.124 as permitted sender) smtp.mailfrom=philmd@redhat.com; dmarc=pass header.from= (p=none dis=none) header.from= Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mx.zohomail.com with SMTPS id 1604309025923569.7094281940382; Mon, 2 Nov 2020 01:23:45 -0800 (PST) Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-583-l1FR8t54N5WbSgCO-DEbkw-1; Mon, 02 Nov 2020 04:23:43 -0500 Received: by mail-wr1-f69.google.com with SMTP id w1so6183554wrr.5 for ; Mon, 02 Nov 2020 01:23:42 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id e25sm22320755wra.71.2020.11.02.01.23.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Nov 2020 01:23:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604309024; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oqaCBtiyHyraZrQbnp3YwL6DATj7zhKDy6uE+R2EKuw=; b=J3ZtZJMuUN3jLwHNc01gVtlvWBnQEkvglbz9QPtHklZr6wrCoPA5aHcPZ9ZgaXOixJRtYQ DhDaQcykzrVwOG627cJRWfYX7wssbzUs8ewPNXlhutFKd0Rv7wDbdT2MZBnRSv2yvp2fkO XbTSfrgRoEBBTjKNTpt4p+BmhyLBvZY= X-MC-Unique: l1FR8t54N5WbSgCO-DEbkw-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=oqaCBtiyHyraZrQbnp3YwL6DATj7zhKDy6uE+R2EKuw=; b=OfUQRDVVSGUbN87Y8Xz36oXNHsiM6m7MEmO6L1eT3dF2w6vZSGdUJaZshIDa1eQEgv DlBPCzDW/E0aaRvLh07fseZorIeyQobjYvJXXZbM+qNWFCI9oJkrC/kfBK+l4IZSx6nJ pYiQRv3xj1Ch3B2OvjwZc5jWpZ2PXwH1rQbViloAremWugoSKCuy6jvomw9fUiIqy4LN Oy51Otikb8dE/4nbD+5/5g7tbLiLmj1j8Lhme8/lICGV8x7Ukv/wtcnwnbjsDWpe13qB Fc5B3LcG8Lmei7QHipf20w7Fu/IfhcgAXxEcR3XLnBvBJnlosJBX7l05OS4L+/BehR6s lRKw== X-Gm-Message-State: AOAM530Lc90EIHIEwfimf/ZpyrYUVCeBmd8wryiG+/ZGD47Sc9arE1l6 YmXXjBaW/905Qz1rJeAphCRF1EPYFG307sY/T0zwJLfvQFifCs5d1kh4MrEiXmj3wxE9m+kjItB D8FHuLT8ygSR7OQ== X-Received: by 2002:a7b:c957:: with SMTP id i23mr17275123wml.155.1604309022003; Mon, 02 Nov 2020 01:23:42 -0800 (PST) X-Google-Smtp-Source: ABdhPJyyk+QDyNpG9dTaMZWy9y7bOQsX/Fs8KwApcQ2y4Nep/+DGI2aKxQqqzql7YYHH2+tbtT9EIQ== X-Received: by 2002:a7b:c957:: with SMTP id i23mr17275102wml.155.1604309021883; Mon, 02 Nov 2020 01:23:41 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , qemu-trivial@nongnu.org, "Dr. David Alan Gilbert" , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= Subject: [PATCH-for-5.2 v2] tools/virtiofsd: Check vu_init() return value (CID 1435958) Date: Mon, 2 Nov 2020 10:23:39 +0100 Message-Id: <20201102092339.2034297-1-philmd@redhat.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=philmd@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @redhat.com) Since commit 6f5fd837889, vu_init() can fail if malloc() returns NULL. This fixes the following Coverity warning: CID 1435958 (#1 of 1): Unchecked return value (CHECKED_RETURN) Fixes: 6f5fd837889 ("libvhost-user: support many virtqueues") Reviewed-by: Dr. David Alan Gilbert Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- v2: Add fuse_log() --- tools/virtiofsd/fuse_virtio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/virtiofsd/fuse_virtio.c b/tools/virtiofsd/fuse_virtio.c index 324936948d3..83ba07c6cd8 100644 --- a/tools/virtiofsd/fuse_virtio.c +++ b/tools/virtiofsd/fuse_virtio.c @@ -1013,8 +1013,11 @@ int virtio_session_mount(struct fuse_session *se) se->vu_socketfd =3D data_sock; se->virtio_dev->se =3D se; pthread_rwlock_init(&se->virtio_dev->vu_dispatch_rwlock, NULL); - vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, NULL, - fv_set_watch, fv_remove_watch, &fv_iface); + if (!vu_init(&se->virtio_dev->dev, 2, se->vu_socketfd, fv_panic, NULL, + fv_set_watch, fv_remove_watch, &fv_iface)) { + fuse_log(FUSE_LOG_ERR, "%s: vu_init failed\n", __func__); + return -1; + } =20 return 0; } --=20 2.26.2