From patchwork Wed Jul 31 16:10:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 11068663 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 57204912 for ; Wed, 31 Jul 2019 16:21:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 42E0B1FF41 for ; Wed, 31 Jul 2019 16:21:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 374732018F; Wed, 31 Jul 2019 16:21:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E6C211FF41 for ; Wed, 31 Jul 2019 16:21:43 +0000 (UTC) Received: from localhost ([::1]:42546 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsrMF-00031H-BG for patchwork-qemu-devel@patchwork.kernel.org; Wed, 31 Jul 2019 12:21:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41121) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hsrBK-00060p-Qp for qemu-devel@nongnu.org; Wed, 31 Jul 2019 12:10:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hsrBJ-0001sq-UP for qemu-devel@nongnu.org; Wed, 31 Jul 2019 12:10:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:47746) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hsrBH-0001oe-V7 for qemu-devel@nongnu.org; Wed, 31 Jul 2019 12:10:25 -0400 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 832D130832DC; Wed, 31 Jul 2019 16:10:22 +0000 (UTC) Received: from localhost (ovpn-117-27.ams2.redhat.com [10.36.117.27]) by smtp.corp.redhat.com (Postfix) with ESMTP id C9F7560C05; Wed, 31 Jul 2019 16:10:14 +0000 (UTC) From: Stefan Hajnoczi To: virtio-fs@redhat.com, qemu-devel@nongnu.org Date: Wed, 31 Jul 2019 17:10:02 +0100 Message-Id: <20190731161006.9447-2-stefanha@redhat.com> In-Reply-To: <20190731161006.9447-1-stefanha@redhat.com> References: <20190731161006.9447-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.44]); Wed, 31 Jul 2019 16:10:22 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 1/5] virtiofsd: take lo->mutex around lo_add_fd_mapping() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Liu Bo , "Dr. David Alan Gilbert" , Stefan Hajnoczi Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The lo_add_fd_mapping() function assumes lo->mutex is held, so we should acquire it. Signed-off-by: Stefan Hajnoczi --- contrib/virtiofsd/passthrough_ll.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/virtiofsd/passthrough_ll.c b/contrib/virtiofsd/passthrough_ll.c index 65b7352c95..417a104218 100644 --- a/contrib/virtiofsd/passthrough_ll.c +++ b/contrib/virtiofsd/passthrough_ll.c @@ -1555,7 +1555,9 @@ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name, update_version(lo, lo_inode(req, parent)); + pthread_mutex_lock(&lo->mutex); fh = lo_add_fd_mapping(req, fd); + pthread_mutex_unlock(&lo->mutex); if (fh == -1) { close(fd); fuse_reply_err(req, ENOMEM); @@ -1760,7 +1762,9 @@ static void lo_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) if (fd == -1) return (void) fuse_reply_err(req, errno); + pthread_mutex_lock(&lo->mutex); fh = lo_add_fd_mapping(req, fd); + pthread_mutex_unlock(&lo->mutex); if (fh == -1) { close(fd); fuse_reply_err(req, ENOMEM);