From patchwork Tue Sep 26 12:59:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jens Freimann X-Patchwork-Id: 9971959 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 216FB6037E for ; Tue, 26 Sep 2017 13:01:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1C0AB289E2 for ; Tue, 26 Sep 2017 13:01:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10DED28D23; Tue, 26 Sep 2017 13:01:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7663E289E2 for ; Tue, 26 Sep 2017 13:01:20 +0000 (UTC) Received: from localhost ([::1]:47441 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwpUE-0000OI-TC for patchwork-qemu-devel@patchwork.kernel.org; Tue, 26 Sep 2017 09:01:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36111) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dwpSz-0000N9-P6 for qemu-devel@nongnu.org; Tue, 26 Sep 2017 09:00:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dwpSu-0003xL-2O for qemu-devel@nongnu.org; Tue, 26 Sep 2017 09:00:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42924) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dwpSt-0003w1-SE for qemu-devel@nongnu.org; Tue, 26 Sep 2017 08:59:55 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id EC75EC057FA7; Tue, 26 Sep 2017 12:59:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com EC75EC057FA7 Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx08.extmail.prod.ext.phx2.redhat.com; spf=fail smtp.mailfrom=jfreimann@redhat.com Received: from localhost (ovpn-117-88.ams2.redhat.com [10.36.117.88]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 91DCA6F95B; Tue, 26 Sep 2017 12:59:53 +0000 (UTC) From: Jens Freimann To: qemu-devel@nongnu.org Date: Tue, 26 Sep 2017 14:59:52 +0200 Message-Id: <20170926125952.7601-1-jfreimann@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 (mx1.redhat.com [10.5.110.32]); Tue, 26 Sep 2017 12:59:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH] net: fix check for number of parameters to -netdev socket X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jasowang@redhat.com, maozy.fnst@cn.fujitsu.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Since commit 0f8c289ad "net: fix -netdev socket,fd= for UDP sockets" we allow more than one parameter for -netdev socket. But now we run into an assert when no parameter at all is specified > qemu-system-x86_64 -net socket socket.c:729: net_init_socket: Assertion `sock->has_udp' failed. Change the check and error message to reflect that at least one of the options has to be specified. An example for when we need more than on is when we hand in a UDP socket. Then we have fd= and udp= as parameters. Cc: Jason Wang Fixes: 0f8c289ad539feb5135c545bea947b310a893f4b Reported-by: Mao Zhongyi Signed-off-by: Jens Freimann --- v1->v2: - add check to prevent listen= and connect= being used at the same time net/socket.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/net/socket.c b/net/socket.c index e6b471c63d..74a2eff2e0 100644 --- a/net/socket.c +++ b/net/socket.c @@ -695,13 +695,18 @@ int net_init_socket(const Netdev *netdev, const char *name, assert(netdev->type == NET_CLIENT_DRIVER_SOCKET); sock = &netdev->u.socket; - if (sock->has_listen + sock->has_connect + sock->has_mcast + - sock->has_udp > 1) { - error_setg(errp, "exactly one of listen=, connect=, mcast= or udp=" + if (sock->has_fd + sock->has_listen + sock->has_connect + sock->has_mcast + + sock->has_udp == 0) { + error_setg(errp, "at least one of fd=, listen=, connect=, mcast= or udp=" " is required"); return -1; } + if (sock->has_listen && sock->has_connect) { + error_setg(errp, "listen= and connect= can't be used together"); + return -1; + } + if (sock->has_localaddr && !sock->has_mcast && !sock->has_udp) { error_setg(errp, "localaddr= is only valid with mcast= or udp="); return -1;