From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8744C433E2 for ; Tue, 8 Sep 2020 11:08:38 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 5425D208FE for ; Tue, 8 Sep 2020 11:08:38 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="ExYApZU/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5425D208FE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57868 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kFbUL-0008HU-FE for qemu-devel@archiver.kernel.org; Tue, 08 Sep 2020 07:08:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42312) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kFbTJ-0006zR-6y for qemu-devel@nongnu.org; Tue, 08 Sep 2020 07:07:33 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:55886 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kFbTG-0005hw-DD for qemu-devel@nongnu.org; Tue, 08 Sep 2020 07:07:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1599563248; h=from:from:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:in-reply-to:in-reply-to: references:references; bh=1r7EpQaBjMqJuLagAewcV/RvT23skpJ9n1yAy1nKE4s=; b=ExYApZU/9KP3Am0YgbWBfKkQR6AuywqgfnVPzNa/BcBTht9pce4WU9uTHMesvzBZXSHkdl EV13YjpM8nJj71Mbk2rRL40QCPo9yF70wpzQRYCI5P2NGZIYiy7ORCuL20w9NXrHjTmBlo onJSsKrEFYPPTlWBBUE7ABIzsksIE6E= 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-524-dLTdZLubNWur_GutQkGN0A-1; Tue, 08 Sep 2020 07:07:23 -0400 X-MC-Unique: dLTdZLubNWur_GutQkGN0A-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A16DB10BBECF for ; Tue, 8 Sep 2020 11:07:22 +0000 (UTC) Received: from redhat.com (ovpn-113-154.ams2.redhat.com [10.36.113.154]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 4C8125D9E8; Tue, 8 Sep 2020 11:07:18 +0000 (UTC) Date: Tue, 8 Sep 2020 12:07:15 +0100 From: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= To: Thomas Huth Subject: Re: [PATCH] tests/socket-helpers: Only fail socket protocol check if it is really necessary Message-ID: <20200908110715.GF899163@redhat.com> References: <20200908105435.218715-1-thuth@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200908105435.218715-1-thuth@redhat.com> User-Agent: Mutt/1.14.6 (2020-07-11) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0.002 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Received-SPF: pass client-ip=205.139.110.120; envelope-from=berrange@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/09/08 02:10:53 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: , Reply-To: Daniel =?utf-8?B?UC4gQmVycmFuZ8Op?= Cc: =?utf-8?Q?Marc-Andr=C3=A9?= Lureau , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, Sep 08, 2020 at 12:54:35PM +0200, Thomas Huth wrote: > The tests/test-char test is currently always failing on my system since > socket_can_bind_connect("::1", PF_INET6) fails with EINVAL and thus > socket_check_protocol_support() is returning -1 for an error. But IPv4 > is working fine. The logic in socket_check_protocol_support() seems to > be wrong here, if either IPv6 or IPv4 is working, we should not return > an error here. Thus rework the function to only return errors if both > checks failed. Can you tell me which exact syscall is giving EINVAL in this scenario ? > > Signed-off-by: Thomas Huth > --- > tests/socket-helpers.c | 23 +++++++++-------------- > 1 file changed, 9 insertions(+), 14 deletions(-) > > diff --git a/tests/socket-helpers.c b/tests/socket-helpers.c > index 19a51e887e..62a0e0f2d9 100644 > --- a/tests/socket-helpers.c > +++ b/tests/socket-helpers.c > @@ -136,22 +136,17 @@ static int socket_can_bind_connect(const char *hostname, int family) > > int socket_check_protocol_support(bool *has_ipv4, bool *has_ipv6) > { > - *has_ipv4 = *has_ipv6 = false; > + int errv4, errv6; > > - if (socket_can_bind_connect("127.0.0.1", PF_INET) < 0) { > - if (errno != EADDRNOTAVAIL) { > - return -1; > - } > - } else { > - *has_ipv4 = true; > - } > + errv4 = socket_can_bind_connect("127.0.0.1", PF_INET); > + *has_ipv4 = (errv4 == 0); > > - if (socket_can_bind_connect("::1", PF_INET6) < 0) { > - if (errno != EADDRNOTAVAIL) { > - return -1; > - } > - } else { > - *has_ipv6 = true; > + errv6 = socket_can_bind_connect("::1", PF_INET6); > + *has_ipv6 = (errv6 == 0); > + > + if (!*has_ipv4 && !*has_ipv6 && > + (errv4 != EADDRNOTAVAIL || errv6 != EADDRNOTAVAIL)) { > + return -1; > } The return value of socket_can_bind_connect is either 0 or -1, but you're treating it an errno which isn't right. Regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|