{"id":813464,"url":"http://patchwork.ozlabs.org/api/patches/813464/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505312203-6319-1-git-send-email-jan.dakinevich@gmail.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<1505312203-6319-1-git-send-email-jan.dakinevich@gmail.com>","list_archive_url":null,"date":"2017-09-13T14:16:43","name":"virtio-9p: don't break device on marshaling fail","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a75324065e9765e2e7463da2a246b99d6da49755","submitter":{"id":71018,"url":"http://patchwork.ozlabs.org/api/people/71018/?format=json","name":"Jan Dakinevich","email":"jan.dakinevich@gmail.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1505312203-6319-1-git-send-email-jan.dakinevich@gmail.com/mbox/","series":[{"id":2926,"url":"http://patchwork.ozlabs.org/api/series/2926/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2926","date":"2017-09-13T14:16:43","name":"virtio-9p: don't break device on marshaling fail","version":1,"mbox":"http://patchwork.ozlabs.org/series/2926/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/813464/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/813464/checks/","tags":{},"related":[],"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=)","ozlabs.org;\n\tdkim=fail reason=\"signature verification failed\" (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"uTb8sGfM\"; dkim-atps=neutral"],"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 3xskGh0ydVz9sPk\n\tfor ;\n\tThu, 14 Sep 2017 00:15:54 +1000 (AEST)","from localhost ([::1]:42761 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1ds8SF-0002sk-KK\n\tfor incoming@patchwork.ozlabs.org; Wed, 13 Sep 2017 10:15:51 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60597)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1ds8Ru-0002sa-ST\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:15:31 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1ds8Ro-0000NU-Ri\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:15:30 -0400","from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:37748)\n\tby eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)\n\t(Exim 4.71) (envelope-from )\n\tid 1ds8Ro-0000MI-KO\n\tfor qemu-devel@nongnu.org; Wed, 13 Sep 2017 10:15:24 -0400","by mail-lf0-x243.google.com with SMTP id q132so180538lfe.4\n\tfor ; Wed, 13 Sep 2017 07:15:23 -0700 (PDT)","from localhost.localdomain (home.eubridge.org. [194.28.30.174])\n\tby smtp.gmail.com with ESMTPSA id\n\tq18sm1729505lja.19.2017.09.13.07.15.21\n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);\n\tWed, 13 Sep 2017 07:15:21 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025;\n\th=from:to:cc:subject:date:message-id;\n\tbh=JVWM3xgmVxpDy1YniKnCKE90Gi9Fp6lrGfC01l7FWeo=;\n\tb=uTb8sGfMrnAA8w/jP449+TQ0Ouu3/CdFQmNPkizhl/TKxrKkr7G3x+ANK+lQQ9nDbu\n\td53Ny20DwfU/iKC2nU/312HpeRCNzfQyc6Fbgo9fMIGDMkga9jSyH7J5WPR9DGKQ1obd\n\tBDbdXvCaMlUWCdQClIp0jROC0u2ammha/h1S6scIVurg2hlsEjDp3hFapFUqMElpt+9g\n\t29HyqSUOFPAnilFt81P3qx0j5fwIufirLuJPeLwpH9kFLcPB0S8yFu90uethbZfcjF0y\n\toyXrcztm73JXwpib4N+7mIxzQVgczD9dp4cOw+bXH7w5+SWcxDspJdIyr/3KyyfvjbJm\n\tvvjw==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:cc:subject:date:message-id;\n\tbh=JVWM3xgmVxpDy1YniKnCKE90Gi9Fp6lrGfC01l7FWeo=;\n\tb=MBWbtmGUeWFmaF0VTz/0z0hi2NS26v2Rz8+qAxxDJfA3kEW42VKB0/GWOEff+w5q7L\n\thPqjEdFi/D3jlCySbXz9Gy+yT4lw8vWcqIzkoKHEiZhJvc3oUJ6V30thuRNwj0SHnh8q\n\t0e4+HkdyV/Qy2s986cmRPKOodBKBBapA367uyuvcZIsEUefp+pbJ00tx6HFvcV+5Dkx+\n\tj+nlZw1CYn+MhqrB0ue9ntrrOMwhTyZDKynQUVC75RciqR2HSGxDJAiTZHaGdohQ+Jpw\n\tTUcNW8z96vfvYxykICr3D4VjDk7rwky27KMww1MrtK01zrf+dkqP9FQOVfeKxPtW4tL1\n\t7wiQ==","X-Gm-Message-State":"AHPjjUhA8A03OkdEX0P1nwe4fai9wIU8v6r6l83X2VkQaXbjIW/FUlP6\n\tnI0hT7YdY2FRJA==","X-Google-Smtp-Source":"AOwi7QByortpVJE2cLMGshNxV5TqEe8yNYEzJ7ENcQehIq9gJT/UmwxQjWduLkQ3MVT2xq3ZRRR+eg==","X-Received":"by 10.46.20.84 with SMTP id 20mr544937lju.125.1505312122022;\n\tWed, 13 Sep 2017 07:15:22 -0700 (PDT)","From":"Jan Dakinevich ","To":"Greg Kurz ,\n\tqemu-devel@nongnu.org","Date":"Wed, 13 Sep 2017 17:16:43 +0300","Message-Id":"<1505312203-6319-1-git-send-email-jan.dakinevich@gmail.com>","X-Mailer":"git-send-email 2.1.4","X-detected-operating-system":"by eggs.gnu.org: Genre and OS details not\n\trecognized.","X-Received-From":"2a00:1450:4010:c07::243","Subject":"[Qemu-devel] [PATCH] virtio-9p: don't break device on marshaling\n\tfail","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":"Jan Dakinevich ,\n\t\"Aneesh Kumar K.V\" ,\n\t\"Michael S. Tsirkin\" ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Fix regression from commit 8d37de41cab145cbba250a8f1f1372b0a5cdf26f.\n\nThe situation when pdu_marshal returns an error should be considered\nvalid. At least `v9fs_do_readdir_with_stat' relies on that to place in\nresponce buffer as much data as can fit.\n\nSigned-off-by: Jan Dakinevich \n---\n hw/9pfs/virtio-9p-device.c | 19 ++-----------------\n 1 file changed, 2 insertions(+), 17 deletions(-)","diff":"diff --git a/hw/9pfs/virtio-9p-device.c b/hw/9pfs/virtio-9p-device.c\nindex 62650b0..c3e5935 100644\n--- a/hw/9pfs/virtio-9p-device.c\n+++ b/hw/9pfs/virtio-9p-device.c\n@@ -146,16 +146,8 @@ static ssize_t virtio_pdu_vmarshal(V9fsPDU *pdu, size_t offset,\n V9fsState *s = pdu->s;\n V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);\n VirtQueueElement *elem = v->elems[pdu->idx];\n- ssize_t ret;\n \n- ret = v9fs_iov_vmarshal(elem->in_sg, elem->in_num, offset, 1, fmt, ap);\n- if (ret < 0) {\n- VirtIODevice *vdev = VIRTIO_DEVICE(v);\n-\n- virtio_error(vdev, \"Failed to encode VirtFS reply type %d\",\n- pdu->id + 1);\n- }\n- return ret;\n+ return v9fs_iov_vmarshal(elem->in_sg, elem->in_num, offset, 1, fmt, ap);\n }\n \n static ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset,\n@@ -164,15 +156,8 @@ static ssize_t virtio_pdu_vunmarshal(V9fsPDU *pdu, size_t offset,\n V9fsState *s = pdu->s;\n V9fsVirtioState *v = container_of(s, V9fsVirtioState, state);\n VirtQueueElement *elem = v->elems[pdu->idx];\n- ssize_t ret;\n \n- ret = v9fs_iov_vunmarshal(elem->out_sg, elem->out_num, offset, 1, fmt, ap);\n- if (ret < 0) {\n- VirtIODevice *vdev = VIRTIO_DEVICE(v);\n-\n- virtio_error(vdev, \"Failed to decode VirtFS request type %d\", pdu->id);\n- }\n- return ret;\n+ return v9fs_iov_vunmarshal(elem->out_sg, elem->out_num, offset, 1, fmt, ap);\n }\n \n static void virtio_init_in_iov_from_pdu(V9fsPDU *pdu, struct iovec **piov,\n","prefixes":[]}