{"id":806893,"url":"http://patchwork.ozlabs.org/api/1.0/patches/806893/?format=json","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.0/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<1503965694-10794-79-git-send-email-mdroth@linux.vnet.ibm.com>","date":"2017-08-29T00:14:53","name":"[78/79] block/nfs: fix mutex assertion in nfs_file_close()","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"6a2bc6ca791b27ef01514f80a69835b8db9b7c85","submitter":{"id":5549,"url":"http://patchwork.ozlabs.org/api/1.0/people/5549/?format=json","name":"Michael Roth","email":"mdroth@linux.vnet.ibm.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-79-git-send-email-mdroth@linux.vnet.ibm.com/mbox/","series":[{"id":281,"url":"http://patchwork.ozlabs.org/api/1.0/series/281/?format=json","date":"2017-08-29T00:13:45","name":"Patch Round-up for stable 2.9.1, freeze on 2017-09-04","version":1,"mbox":"http://patchwork.ozlabs.org/series/281/mbox/"}],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/806893/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xh9gh391Yz9sQl\n\tfor ;\n\tTue, 29 Aug 2017 11:16:00 +1000 (AEST)","from localhost ([::1]:42233 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dmV8H-0004OU-W4\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 21:15:58 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:49170)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dmUCz-0001xs-Jp\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:49 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dmUCw-0006M9-7q\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:45 -0400","from mx0b-001b2d01.pphosted.com ([148.163.158.5]:58301\n\thelo=mx0a-001b2d01.pphosted.com)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dmUCv-0006La-Va\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:42 -0400","from pps.filterd (m0098420.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0E8nu099508\n\tfor ; Mon, 28 Aug 2017 20:16:41 -0400","from e35.co.us.ibm.com (e35.co.us.ibm.com [32.97.110.153])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cmr22ykt5-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor ; Mon, 28 Aug 2017 20:16:41 -0400","from localhost\n\tby e35.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor from ;\n\tMon, 28 Aug 2017 18:16:40 -0600","from b03cxnp08025.gho.boulder.ibm.com (9.17.130.17)\n\tby e35.co.us.ibm.com (192.168.1.135) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 18:16:39 -0600","from b03ledav005.gho.boulder.ibm.com\n\t(b03ledav005.gho.boulder.ibm.com [9.17.130.236])\n\tby b03cxnp08025.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7T0GckB2752888; Mon, 28 Aug 2017 17:16:38 -0700","from b03ledav005.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 9C7B3BE040;\n\tMon, 28 Aug 2017 18:16:38 -0600 (MDT)","from localhost (unknown [9.80.85.217])\n\tby b03ledav005.gho.boulder.ibm.com (Postfix) with ESMTP id 687BFBE03A;\n\tMon, 28 Aug 2017 18:16:38 -0600 (MDT)"],"From":"Michael Roth ","To":"qemu-devel@nongnu.org","Date":"Mon, 28 Aug 2017 19:14:53 -0500","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","References":"<1503965694-10794-1-git-send-email-mdroth@linux.vnet.ibm.com>","X-TM-AS-GCONF":"00","x-cbid":"17082900-0012-0000-0000-000014ECDC63","X-IBM-SpamModules-Scores":"","X-IBM-SpamModules-Versions":"BY=3.00007630; HX=3.00000241; KW=3.00000007;\n\tPH=3.00000004; SC=3.00000226; SDB=6.00909028; UDB=6.00455849;\n\tIPR=6.00689279; \n\tBA=6.00005557; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009;\n\tZB=6.00000000; \n\tZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00016909;\n\tXFM=3.00000015; UTC=2017-08-29 00:16:40","X-IBM-AV-DETECTION":"SAVI=unused REMOTE=unused XFE=unused","x-cbparentid":"17082900-0013-0000-0000-00004F43FB7A","Message-Id":"<1503965694-10794-79-git-send-email-mdroth@linux.vnet.ibm.com>","X-Proofpoint-Virus-Version":"vendor=fsecure engine=2.50.10432:, ,\n\tdefinitions=2017-08-28_13:, , signatures=0","X-Proofpoint-Spam-Details":"rule=outbound_notspam policy=outbound score=0\n\tspamscore=0 suspectscore=3\n\tmalwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam\n\tadjust=0 reason=mlx scancount=1 engine=8.0.1-1707230000\n\tdefinitions=main-1708290001","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 3.x [generic] [fuzzy]","X-Received-From":"148.163.158.5","Subject":"[Qemu-devel] [PATCH 78/79] block/nfs: fix mutex assertion in\n\tnfs_file_close()","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"Kevin Wolf , Jeff Cody ,\n\tqemu-stable@nongnu.org","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Jeff Cody \n\nCommit c096358e747e88fc7364e40e3c354ee0bb683960 introduced assertion\nchecks for when qemu_mutex() functions are called without the\ncorresponding qemu_mutex_init() having initialized the mutex.\n\nThis uncovered a latent bug in qemu's nfs driver - in\nnfs_client_close(), the NFSClient structure is overwritten with zeros,\nprior to the mutex being destroyed.\n\nGo ahead and destroy the mutex in nfs_client_close(), and change where\nwe call qemu_mutex_init() so that it is correctly balanced.\n\nThere are also a couple of memory leaks obscured by the memset, so this\nfixes those as well.\n\nFinally, we should be able to get rid of the memset(), as it isn't\nnecessary.\n\nCc: qemu-stable@nongnu.org\nSigned-off-by: Jeff Cody \nReviewed-by: Peter Lieven \nReviewed-by: Stefan Hajnoczi \nReviewed-by: John Snow \nSigned-off-by: Kevin Wolf \n(cherry picked from commit 113fe792fd4931dd0538f03859278b8719ee4fa2)\nSigned-off-by: Michael Roth \n---\n block/nfs.c | 11 ++++++++---\n 1 file changed, 8 insertions(+), 3 deletions(-)","diff":"diff --git a/block/nfs.c b/block/nfs.c\nindex 344186f..7e1bea1 100644\n--- a/block/nfs.c\n+++ b/block/nfs.c\n@@ -434,19 +434,23 @@ static void nfs_client_close(NFSClient *client)\n if (client->context) {\n if (client->fh) {\n nfs_close(client->context, client->fh);\n+ client->fh = NULL;\n }\n aio_set_fd_handler(client->aio_context, nfs_get_fd(client->context),\n false, NULL, NULL, NULL, NULL);\n nfs_destroy_context(client->context);\n+ client->context = NULL;\n }\n- memset(client, 0, sizeof(NFSClient));\n+ g_free(client->path);\n+ qemu_mutex_destroy(&client->mutex);\n+ qapi_free_NFSServer(client->server);\n+ client->server = NULL;\n }\n \n static void nfs_file_close(BlockDriverState *bs)\n {\n NFSClient *client = bs->opaque;\n nfs_client_close(client);\n- qemu_mutex_destroy(&client->mutex);\n }\n \n static NFSServer *nfs_config(QDict *options, Error **errp)\n@@ -499,6 +503,7 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options,\n struct stat st;\n char *file = NULL, *strp = NULL;\n \n+ qemu_mutex_init(&client->mutex);\n opts = qemu_opts_create(&runtime_opts, NULL, 0, &error_abort);\n qemu_opts_absorb_qdict(opts, options, &local_err);\n if (local_err) {\n@@ -661,7 +666,7 @@ static int nfs_file_open(BlockDriverState *bs, QDict *options, int flags,\n if (ret < 0) {\n return ret;\n }\n- qemu_mutex_init(&client->mutex);\n+\n bs->total_sectors = ret;\n ret = 0;\n return ret;\n","prefixes":["78/79"]}