From nobody Wed Dec 17 21:52:56 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1602273467; cv=none; d=zohomail.com; s=zohoarc; b=bTKqrGZCLQoQAZywa5iYOm2OylXMOsj+EJEu/BxFYqPb5G55LFPibUZloYR7W3FcczEmSgfLfkvAe6EDPgwvUuKx5pOAzo+MrbJ9tCKQg3m/USS4uv+tjA8ZcpUL01PTteX1QV7CqjqL6fw1C93c/76AxufOpLhoGKKrMAnsn2U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1602273467; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=rL2Yc6BuwMTYcKzaE86cfjwOGuNJuMAwkh3aHOUH+kQ=; b=D2fY7TIIpAnAy3Sj2wnsw2RyEBRg+KgYt5RwW/O/1nykweL7H+xazdnV+WEaJzb98pIvMGUEc3PfDmhv7UqeZyqT2iYPfxKiApe0Dws8xbeQeS1XiwUazL4aaYLRGA36KJsLZMqVuuMh3VB8kZ+Pi3gfgiyPXwoqjlHJBhzCHeI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1602273467729529.48792981107; Fri, 9 Oct 2020 12:57:47 -0700 (PDT) Received: from localhost ([::1]:43900 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kQyWQ-0008NB-C4 for importer@patchew.org; Fri, 09 Oct 2020 15:57:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48080) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kQyCL-0001yX-Oc for qemu-devel@nongnu.org; Fri, 09 Oct 2020 15:37:01 -0400 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:59938) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kQyCJ-0002zu-Vy for qemu-devel@nongnu.org; Fri, 09 Oct 2020 15:37:01 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-590-fH0I4PVnNwae3crrbN-a3Q-1; Fri, 09 Oct 2020 15:36:57 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D1B385703A; Fri, 9 Oct 2020 19:36:55 +0000 (UTC) Received: from localhost (ovpn-112-20.ams2.redhat.com [10.36.112.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3B9975C22D; Fri, 9 Oct 2020 19:36:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1602272219; 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: in-reply-to:in-reply-to:references:references; bh=rL2Yc6BuwMTYcKzaE86cfjwOGuNJuMAwkh3aHOUH+kQ=; b=iG/JY7/Ha99STlFFwP+RZgs4d7l4rqFfOPAyc0JAIqPOrsN0/QKbHj9lqDTV7dJ6YeDx40 oUBMIJP1zNGE3ULnfVkTxbomPyhIUnrke+2w5ivFoN1wQ6klHgkjw/xgbqF4Tf+YgO5y0b SVaIVuMyywaYVYPpQES5io7xt8//+Ew= X-MC-Unique: fH0I4PVnNwae3crrbN-a3Q-1 From: Stefan Hajnoczi To: Peter Maydell , qemu-devel@nongnu.org Subject: [PULL 15/30] util/vhost-user-server: check EOF when reading payload Date: Fri, 9 Oct 2020 20:35:14 +0100 Message-Id: <20201009193529.322822-16-stefanha@redhat.com> In-Reply-To: <20201009193529.322822-1-stefanha@redhat.com> References: <20201009193529.322822-1-stefanha@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=stefanha@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=63.128.21.124; envelope-from=stefanha@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/10/09 02:34:40 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -3 X-Spam_score: -0.4 X-Spam_bar: / X-Spam_report: (-0.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MIME_BASE64_TEXT=1.741, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Laurent Vivier , Kevin Wolf , Thomas Huth , =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Eduardo Habkost , qemu-block@nongnu.org, Markus Armbruster , "Dr. David Alan Gilbert" , Coiby Xu , Max Reitz , Stefan Hajnoczi , Cleber Rosa , Paolo Bonzini , Fam Zheng Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Unexpected EOF is an error that must be reported. Signed-off-by: Stefan Hajnoczi Message-id: 20200924151549.913737-9-stefanha@redhat.com Signed-off-by: Stefan Hajnoczi --- util/vhost-user-server.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c index 5a60e2ca2a..ec555abcb2 100644 --- a/util/vhost-user-server.c +++ b/util/vhost-user-server.c @@ -169,8 +169,10 @@ vu_message_read(VuDev *vu_dev, int conn_fd, VhostUserM= sg *vmsg) }; if (vmsg->size) { rc =3D qio_channel_readv_all_eof(ioc, &iov_payload, 1, &local_err); - if (rc =3D=3D -1) { - error_report_err(local_err); + if (rc !=3D 1) { + if (local_err) { + error_report_err(local_err); + } goto fail; } } --=20 2.26.2