From nobody Sun Feb 8 14:52:34 2026 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=1604412514; cv=none; d=zohomail.com; s=zohoarc; b=VSTrUNpH7s+5Kiy54iRq+BcEccSJLQ5ujsdxls3N9zJIKmet9/GmtVNpftvceNiaES2/bL1UahbpWbOuQ+6OSfv4LVQm2MwrYHLZ/8perJVX8+MAleX5OLMUKuWdLYi7hi4EHXNffkIZWXWjjE8tOnDlhYCjB/AikqKrMEoEmAI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604412514; 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=Q+IjmS1q+jOGviqOHLrLDb+/UDo2/xtYhKrZpy2+2zU=; b=e6oMyghvwDrIQqlkjtEkhP3L+71jm5mc8U+reWoeLOUlyNZUf1mamPHuhNMaDy/OvyW77GC0UJskGBxQzoeaPwlkNxrR3vQxf/MdWwWVeyRc7m89H/BwGupFGDwgmEVDBWwYibYpNZuCPd6c2OywhOOs6AiwgvNLExO4kAGbPsw= 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 1604412514210108.6777397191538; Tue, 3 Nov 2020 06:08:34 -0800 (PST) Received: from localhost ([::1]:41726 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZwzB-0003k8-9w for importer@patchew.org; Tue, 03 Nov 2020 09:08:33 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:49196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZwtt-0006pC-EI for qemu-devel@nongnu.org; Tue, 03 Nov 2020 09:03:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:53127) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZwtr-0003PI-3I for qemu-devel@nongnu.org; Tue, 03 Nov 2020 09:03:05 -0500 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-306-daTXTdvvMKK1A2mXSBXBAw-1; Tue, 03 Nov 2020 09:03:00 -0500 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 mimecast-mx01.redhat.com (Postfix) with ESMTPS id 421B364151 for ; Tue, 3 Nov 2020 14:02:59 +0000 (UTC) Received: from fedora.redhat.com (ovpn-115-87.ams2.redhat.com [10.36.115.87]) by smtp.corp.redhat.com (Postfix) with ESMTP id E09CB5B4C7; Tue, 3 Nov 2020 14:02:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604412182; 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=Q+IjmS1q+jOGviqOHLrLDb+/UDo2/xtYhKrZpy2+2zU=; b=DPsZjABFXmsK07shxCcIeb27xFdhUvYFIPvgsF9U7UOkc4rFeVFD7T6AZE8N4JSSRgN/gd NOHv2CQPUVJqca9tePaXEW+woVU8P16IQiwoAsu8/UrVwbvysphLDiA1mZK/h5O404ERio BGJjDlW3I6ty0NSfdV3knabQ+ip4Q4g= X-MC-Unique: daTXTdvvMKK1A2mXSBXBAw-1 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= To: qemu-devel@nongnu.org Subject: [PULL 06/11] test-util-sockets: Test the complete abstract socket matrix Date: Tue, 3 Nov 2020 14:02:20 +0000 Message-Id: <20201103140225.496776-7-berrange@redhat.com> In-Reply-To: <20201103140225.496776-1-berrange@redhat.com> References: <20201103140225.496776-1-berrange@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=berrange@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset="utf-8" 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=berrange@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/03 01:02:05 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_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: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= , Markus Armbruster , Gerd Hoffmann , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) From: Markus Armbruster The test covers only two out of nine combinations. Test all nine. Four turn out to be broken. Marked /* BUG */. Reviewed-by: Paolo Bonzini Reviewed-by: Eric Blake Signed-off-by: Markus Armbruster Signed-off-by: Daniel P. Berrang=C3=A9 --- tests/test-util-sockets.c | 91 ++++++++++++++++++++++++++++----------- 1 file changed, 65 insertions(+), 26 deletions(-) diff --git a/tests/test-util-sockets.c b/tests/test-util-sockets.c index 4cedf622f0..f8b6586e70 100644 --- a/tests/test-util-sockets.c +++ b/tests/test-util-sockets.c @@ -230,60 +230,99 @@ static void test_socket_fd_pass_num_nocli(void) #endif =20 #ifdef __linux__ + +#define ABSTRACT_SOCKET_VARIANTS 3 + +typedef struct { + SocketAddress *server, *client[ABSTRACT_SOCKET_VARIANTS]; + bool expect_connect[ABSTRACT_SOCKET_VARIANTS]; +} abstract_socket_matrix_row; + static gpointer unix_client_thread_func(gpointer user_data) { - SocketAddress *addr =3D user_data; - int fd; - - fd =3D socket_connect(addr, &error_abort); - g_assert_cmpint(fd, >=3D, 0); - close(fd); + abstract_socket_matrix_row *row =3D user_data; + Error *err =3D NULL; + int i, fd; + + for (i =3D 0; i < ABSTRACT_SOCKET_VARIANTS; i++) { + if (row->expect_connect[i]) { + fd =3D socket_connect(row->client[i], &error_abort); + g_assert_cmpint(fd, >=3D, 0); + } else { + fd =3D socket_connect(row->client[i], &err); + g_assert_cmpint(fd, =3D=3D, -1); + error_free_or_abort(&err); + } + close(fd); + } return NULL; } =20 -static void test_socket_unix_abstract_one(SocketAddress *addr) +static void test_socket_unix_abstract_row(abstract_socket_matrix_row *test) { - int fd, connfd; + int fd, connfd, i; GThread *cli; struct sockaddr_un un; socklen_t len =3D sizeof(un); =20 - fd =3D socket_listen(addr, 1, &error_abort); + /* Last one must connect, or else accept() below hangs */ + assert(test->expect_connect[ABSTRACT_SOCKET_VARIANTS - 1]); + + fd =3D socket_listen(test->server, 1, &error_abort); g_assert_cmpint(fd, >=3D, 0); g_assert(fd_is_socket(fd)); =20 cli =3D g_thread_new("abstract_unix_client", unix_client_thread_func, - addr); - - connfd =3D accept(fd, (struct sockaddr *)&un, &len); - g_assert_cmpint(connfd, !=3D, -1); - close(connfd); + test); + + for (i =3D 0; i < ABSTRACT_SOCKET_VARIANTS; i++) { + if (test->expect_connect[i]) { + connfd =3D accept(fd, (struct sockaddr *)&un, &len); + g_assert_cmpint(connfd, !=3D, -1); + close(connfd); + } + } =20 close(fd); - g_thread_join(cli); } =20 -static void test_socket_unix_abstract_good(void) +static void test_socket_unix_abstract(void) { - SocketAddress addr; + SocketAddress addr, addr_tight, addr_padded; + abstract_socket_matrix_row matrix[ABSTRACT_SOCKET_VARIANTS] =3D { + { &addr, + { &addr_tight, &addr_padded, &addr }, + { false /* BUG */, true /* BUG */, true } }, + { &addr_tight, + { &addr_padded, &addr, &addr_tight }, + { false, false /* BUG */, true } }, + { &addr_padded, + { &addr, &addr_tight, &addr_padded }, + { true /* BUG */, false, true } } + }; + int i; =20 addr.type =3D SOCKET_ADDRESS_TYPE_UNIX; addr.u.q_unix.path =3D g_strdup_printf("unix-%d-%u", getpid(), g_random_int()); addr.u.q_unix.has_abstract =3D true; addr.u.q_unix.abstract =3D true; - - /* non tight socklen serv and cli */ addr.u.q_unix.has_tight =3D false; addr.u.q_unix.tight =3D false; - test_socket_unix_abstract_one(&addr); =20 - /* tight socklen serv and cli */ - addr.u.q_unix.has_tight =3D true; - addr.u.q_unix.tight =3D true; - test_socket_unix_abstract_one(&addr); + addr_tight =3D addr; + addr_tight.u.q_unix.has_tight =3D true; + addr_tight.u.q_unix.tight =3D true; + + addr_padded =3D addr; + addr_padded.u.q_unix.has_tight =3D true; + addr_padded.u.q_unix.tight =3D false; + + for (i =3D 0; i < ABSTRACT_SOCKET_VARIANTS; i++) { + test_socket_unix_abstract_row(&matrix[i]); + } =20 g_free(addr.u.q_unix.path); } @@ -330,8 +369,8 @@ int main(int argc, char **argv) } =20 #ifdef __linux__ - g_test_add_func("/util/socket/unix-abstract/good", - test_socket_unix_abstract_good); + g_test_add_func("/util/socket/unix-abstract", + test_socket_unix_abstract); #endif =20 end: --=20 2.28.0