{"id":811288,"url":"http://patchwork.ozlabs.org/api/1.2/patches/811288/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-9-git-send-email-jasowang@redhat.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/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":"<1504836324-4871-9-git-send-email-jasowang@redhat.com>","list_archive_url":null,"date":"2017-09-08T02:05:14","name":"[PULL,08/18] net/socket: Don't treat odd socket type as SOCK_STREAM","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"f34f5c520f2f5ef0b6a8455584624eb772f8b6eb","submitter":{"id":5225,"url":"http://patchwork.ozlabs.org/api/1.2/people/5225/?format=json","name":"Jason Wang","email":"jasowang@redhat.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/1504836324-4871-9-git-send-email-jasowang@redhat.com/mbox/","series":[{"id":2087,"url":"http://patchwork.ozlabs.org/api/1.2/series/2087/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=2087","date":"2017-09-08T02:05:06","name":"[PULL,01/18] net/filter-rewriter.c: Fix rewirter checksum bug when use virtio-net","version":1,"mbox":"http://patchwork.ozlabs.org/series/2087/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/811288/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/811288/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=)","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tdmarc=none (p=none dis=none) header.from=redhat.com","ext-mx04.extmail.prod.ext.phx2.redhat.com;\n\tspf=fail smtp.mailfrom=jasowang@redhat.com"],"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 3xpLNw6wKVz9sDB\n\tfor ;\n\tFri, 8 Sep 2017 12:09:36 +1000 (AEST)","from localhost ([::1]:42955 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dq8je-0005iP-Ut\n\tfor incoming@patchwork.ozlabs.org; Thu, 07 Sep 2017 22:09:34 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:60848)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dq8gM-0003Iy-Ck\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:15 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dq8gH-0002HI-NY\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:10 -0400","from mx1.redhat.com ([209.132.183.28]:50558)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from ) id 1dq8gH-0002Ga-Gy\n\tfor qemu-devel@nongnu.org; Thu, 07 Sep 2017 22:06:05 -0400","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mx1.redhat.com (Postfix) with ESMTPS id 91EF5821C7;\n\tFri, 8 Sep 2017 02:06:04 +0000 (UTC)","from jason-ThinkPad-T450s.redhat.com (ovpn-12-98.pek2.redhat.com\n\t[10.72.12.98])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id ADD2D600C2;\n\tFri, 8 Sep 2017 02:05:59 +0000 (UTC)"],"DMARC-Filter":"OpenDMARC Filter v1.3.2 mx1.redhat.com 91EF5821C7","From":"Jason Wang ","To":"peter.maydell@linaro.org,\n\tqemu-devel@nongnu.org","Date":"Fri, 8 Sep 2017 10:05:14 +0800","Message-Id":"<1504836324-4871-9-git-send-email-jasowang@redhat.com>","In-Reply-To":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","References":"<1504836324-4871-1-git-send-email-jasowang@redhat.com>","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-Greylist":"Sender IP whitelisted, not delayed by milter-greylist-4.5.16\n\t(mx1.redhat.com [10.5.110.28]);\n\tFri, 08 Sep 2017 02:06:04 +0000 (UTC)","X-detected-operating-system":"by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic]\n\t[fuzzy]","X-Received-From":"209.132.183.28","Subject":"[Qemu-devel] [PULL 08/18] net/socket: Don't treat odd socket type\n\tas SOCK_STREAM","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":"Mao Zhongyi , jasowang@redhat.com,\n\tarmbru@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"From: Mao Zhongyi \n\nIn net_socket_fd_init(), the 'default' case is odd: it warns,\nthen continues as if the socket type was SOCK_STREAM. The\ncomment explains \"this could be a eg. a pty\", but that makes\nno sense. If @fd really was a pty, getsockopt() would fail\nwith ENOTSOCK. If @fd was a socket, but neither SOCK_DGRAM nor\nSOCK_STREAM. It should not be treated as if it was SOCK_STREAM.\n\nTurn this case into an Error. If there is a genuine reason to\nsupport something like SOCK_RAW, it should be explicitly\nhandled.\n\nCc: jasowang@redhat.com\nCc: armbru@redhat.com\nCc: berrange@redhat.com\nCc: armbru@redhat.com\nCc: eblake@redhat.com\nSuggested-by: Markus Armbruster \nSuggested-by: Daniel P. Berrange \nSigned-off-by: Mao Zhongyi \nReviewed-by: Markus Armbruster \nSigned-off-by: Jason Wang \n---\n net/socket.c | 6 +++---\n 1 file changed, 3 insertions(+), 3 deletions(-)","diff":"diff --git a/net/socket.c b/net/socket.c\nindex 18af2ab..b4c5a04 100644\n--- a/net/socket.c\n+++ b/net/socket.c\n@@ -448,9 +448,9 @@ static NetSocketState *net_socket_fd_init(NetClientState *peer,\n case SOCK_STREAM:\n return net_socket_fd_init_stream(peer, model, name, fd, is_connected);\n default:\n- /* who knows ... this could be a eg. a pty, do warn and continue as stream */\n- fprintf(stderr, \"qemu: warning: socket type=%d for fd=%d is not SOCK_DGRAM or SOCK_STREAM\\n\", so_type, fd);\n- return net_socket_fd_init_stream(peer, model, name, fd, is_connected);\n+ error_report(\"socket type=%d for fd=%d must be either\"\n+ \" SOCK_DGRAM or SOCK_STREAM\", so_type, fd);\n+ closesocket(fd);\n }\n return NULL;\n }\n","prefixes":["PULL","08/18"]}