Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/806869/?format=api
{ "id": 806869, "url": "http://patchwork.ozlabs.org/api/patches/806869/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-59-git-send-email-mdroth@linux.vnet.ibm.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "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": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<1503965694-10794-59-git-send-email-mdroth@linux.vnet.ibm.com>", "list_archive_url": null, "date": "2017-08-29T00:14:33", "name": "[58/79] nbd: Fully initialize client in case of failed negotiation", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "c55fd8c492606feab8a2543c14fa30684e816b5a", "submitter": { "id": 5549, "url": "http://patchwork.ozlabs.org/api/people/5549/?format=api", "name": "Michael Roth", "email": "mdroth@linux.vnet.ibm.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/1503965694-10794-59-git-send-email-mdroth@linux.vnet.ibm.com/mbox/", "series": [ { "id": 281, "url": "http://patchwork.ozlabs.org/api/series/281/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=281", "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/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/806869/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/806869/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "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=<UNKNOWN>)", "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 3xh9KN1RMzz9sRV\n\tfor <incoming@patchwork.ozlabs.org>;\n\tTue, 29 Aug 2017 11:00:08 +1000 (AEST)", "from localhost ([::1]:42129 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>)\n\tid 1dmUsv-0006TD-Fz\n\tfor incoming@patchwork.ozlabs.org; Mon, 28 Aug 2017 21:00:05 -0400", "from eggs.gnu.org ([2001:4830:134:3::10]:48652)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUCk-0001as-NQ\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:34 -0400", "from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from <mdroth@linux.vnet.ibm.com>) id 1dmUCh-0005vY-AH\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:30 -0400", "from mx0b-001b2d01.pphosted.com ([148.163.158.5]:34974\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 <mdroth@linux.vnet.ibm.com>)\n\tid 1dmUCh-0005uM-3J\n\tfor qemu-devel@nongnu.org; Mon, 28 Aug 2017 20:16:27 -0400", "from pps.filterd (m0098413.ppops.net [127.0.0.1])\n\tby mx0b-001b2d01.pphosted.com (8.16.0.21/8.16.0.21) with SMTP id\n\tv7T0EBKE017922\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:16:26 -0400", "from e37.co.us.ibm.com (e37.co.us.ibm.com [32.97.110.158])\n\tby mx0b-001b2d01.pphosted.com with ESMTP id 2cmub2ww5p-1\n\t(version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT)\n\tfor <qemu-devel@nongnu.org>; Mon, 28 Aug 2017 20:16:26 -0400", "from localhost\n\tby e37.co.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use\n\tOnly! Violators will be prosecuted\n\tfor <qemu-devel@nongnu.org> from <mdroth@linux.vnet.ibm.com>;\n\tMon, 28 Aug 2017 18:16:25 -0600", "from b03cxnp08027.gho.boulder.ibm.com (9.17.130.19)\n\tby e37.co.us.ibm.com (192.168.1.137) with IBM ESMTP SMTP Gateway:\n\tAuthorized Use Only! Violators will be prosecuted; \n\tMon, 28 Aug 2017 18:16:22 -0600", "from b03ledav003.gho.boulder.ibm.com\n\t(b03ledav003.gho.boulder.ibm.com [9.17.130.234])\n\tby b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with\n\tESMTP id v7T0GLNP65208422; Mon, 28 Aug 2017 17:16:21 -0700", "from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1])\n\tby IMSVA (Postfix) with ESMTP id 7F09F6A03C;\n\tMon, 28 Aug 2017 18:16:21 -0600 (MDT)", "from localhost (unknown [9.80.85.217])\n\tby b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP id 4B8216A03D;\n\tMon, 28 Aug 2017 18:16:21 -0600 (MDT)" ], "From": "Michael Roth <mdroth@linux.vnet.ibm.com>", "To": "qemu-devel@nongnu.org", "Date": "Mon, 28 Aug 2017 19:14:33 -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-0024-0000-0000-0000171CE4D5", "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:24", "X-IBM-AV-DETECTION": "SAVI=unused REMOTE=unused XFE=unused", "x-cbparentid": "17082900-0025-0000-0000-00004C7F0560", "Message-Id": "<1503965694-10794-59-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=1\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 58/79] nbd: Fully initialize client in case of\n\tfailed negotiation", "X-BeenThere": "qemu-devel@nongnu.org", "X-Mailman-Version": "2.1.21", "Precedence": "list", "List-Id": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<http://lists.nongnu.org/archive/html/qemu-devel/>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n\t<mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Cc": "Paolo Bonzini <pbonzini@redhat.com>, qemu-stable@nongnu.org", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "\"Qemu-devel\"\n\t<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>" }, "content": "From: Eric Blake <eblake@redhat.com>\n\nIf a non-NBD client connects to qemu-nbd, we would end up with\na SIGSEGV in nbd_client_put() because we were trying to\nunregister the client's association to the export, even though\nwe skipped inserting the client into that list. Easy trigger\nin two terminals:\n\n$ qemu-nbd -p 30001 --format=raw file\n$ nmap 127.0.0.1 -p 30001\n\nnmap claims that it thinks it connected to a pago-services1\nserver (which probably means nmap could be updated to learn the\nNBD protocol and give a more accurate diagnosis of the open\nport - but that's not our problem), then terminates immediately,\nso our call to nbd_negotiate() fails. The fix is to reorder\nnbd_co_client_start() to ensure that all initialization occurs\nbefore we ever try talking to a client in nbd_negotiate(), so\nthat the teardown sequence on negotiation failure doesn't fault\nwhile dereferencing a half-initialized object.\n\nWhile debugging this, I also noticed that nbd_update_server_watch()\ncalled by nbd_client_closed() was still adding a channel to accept\nthe next client, even when the state was no longer RUNNING. That\nis fixed by making nbd_can_accept() pay attention to the current\nstate.\n\nFixes: https://bugzilla.redhat.com/show_bug.cgi?id=1451614\n\nSigned-off-by: Eric Blake <eblake@redhat.com>\nMessage-Id: <20170527030421.28366-1-eblake@redhat.com>\nSigned-off-by: Paolo Bonzini <pbonzini@redhat.com>\n(cherry picked from commit df8ad9f128c15aa0a0ebc7b24e9a22c9775b67af)\nSigned-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>\n---\n nbd/server.c | 8 +++-----\n qemu-nbd.c | 2 +-\n 2 files changed, 4 insertions(+), 6 deletions(-)", "diff": "diff --git a/nbd/server.c b/nbd/server.c\nindex 924a1fe..edfda84 100644\n--- a/nbd/server.c\n+++ b/nbd/server.c\n@@ -1376,16 +1376,14 @@ static coroutine_fn void nbd_co_client_start(void *opaque)\n \n if (exp) {\n nbd_export_get(exp);\n+ QTAILQ_INSERT_TAIL(&exp->clients, client, next);\n }\n+ qemu_co_mutex_init(&client->send_lock);\n+\n if (nbd_negotiate(data)) {\n client_close(client);\n goto out;\n }\n- qemu_co_mutex_init(&client->send_lock);\n-\n- if (exp) {\n- QTAILQ_INSERT_TAIL(&exp->clients, client, next);\n- }\n \n nbd_client_receive_next_request(client);\n \ndiff --git a/qemu-nbd.c b/qemu-nbd.c\nindex e4f00e2..14e7947 100644\n--- a/qemu-nbd.c\n+++ b/qemu-nbd.c\n@@ -324,7 +324,7 @@ out:\n \n static int nbd_can_accept(void)\n {\n- return nb_fds < shared;\n+ return state == RUNNING && nb_fds < shared;\n }\n \n static void nbd_export_closed(NBDExport *exp)\n", "prefixes": [ "58/79" ] }