From nobody Mon Feb 9 23:00:21 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=1604310547; cv=none; d=zohomail.com; s=zohoarc; b=U4vr4nvs0xWnXZpVxBS0D0axUH3VXTcx7ovkSAfTy7HX1OjLw2EpuFP3N+fGtXArbPMNQJEvbN0fNHGr0SCsJYq3Td6RI+J4XXVrsV60VZbx3MGMaiZdzrhjQuOud90bveEIg7vNtSmIS59B6DgAdWIAR487F+8TjGbWXjWtWhs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604310547; 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=lXnQT5h2UgcAD43AxZjNT4Zw1mh8mjKq2nquGQWvbVg=; b=G1szx2rMdkuV8shEJTMymra/waMVtimCMxjABUEGw5+B0hKolctfc92Lb+nGNS4+maYix5xnATyhkmkL2GgZGKuOTFhRseyF2FisJcZovj2jvJEPl//q4iayRh5k9InvQYNZ5jIRRRrpkOVEExD2rRdnjJJHt0YvlSvVC20fuZI= 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 1604310547426929.06193402882; Mon, 2 Nov 2020 01:49:07 -0800 (PST) Received: from localhost ([::1]:49648 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kZWSY-0007VS-2R for importer@patchew.org; Mon, 02 Nov 2020 04:49:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:48242) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kZWOD-0002P5-Vr for qemu-devel@nongnu.org; Mon, 02 Nov 2020 04:44:37 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:53994) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kZWOB-000578-S1 for qemu-devel@nongnu.org; Mon, 02 Nov 2020 04:44:37 -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-596-ZTE4UUAHPKCkchONjGQ8iQ-1; Mon, 02 Nov 2020 04:44:33 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2B61657208; Mon, 2 Nov 2020 09:44:32 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-112-103.ams2.redhat.com [10.36.112.103]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B76251002C18; Mon, 2 Nov 2020 09:44:31 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id EF48410EE54F; Mon, 2 Nov 2020 10:44:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1604310275; 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=lXnQT5h2UgcAD43AxZjNT4Zw1mh8mjKq2nquGQWvbVg=; b=Ru5Rxrt0+8++LkLP8M4lcYq7E99lpLRKIXUNqLTic0IXMZkVL1EheKLAXMf2viCfP88Fjk 3cniRDbIC9Te5rd1Wm66TYpqFCAO9LCdaWyKbuIIMl0B+KdkW9jLyTGi2HtIlQZhxRG7FZ T+1g5YVq1aLzBtK9HT3hb/eh782fHCE= X-MC-Unique: ZTE4UUAHPKCkchONjGQ8iQ-1 From: Markus Armbruster To: qemu-devel@nongnu.org Subject: [PATCH v2 06/11] test-util-sockets: Test the complete abstract socket matrix Date: Mon, 2 Nov 2020 10:44:17 +0100 Message-Id: <20201102094422.173975-7-armbru@redhat.com> In-Reply-To: <20201102094422.173975-1-armbru@redhat.com> References: <20201102094422.173975-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=armbru@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=armbru@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/11/02 03:02:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.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=-1, RCVD_IN_MSPIKE_WL=-0.01, 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: kwolf@redhat.com, berrange@redhat.com, zxq_yx_007@163.com, kraxel@redhat.com, pbonzini@redhat.com, marcandre.lureau@redhat.com 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" 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 --- tests/test-util-sockets.c | 87 ++++++++++++++++++++++++++++----------- 1 file changed, 63 insertions(+), 24 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; + abstract_socket_matrix_row *row =3D user_data; + Error *err =3D NULL; + int i, fd; =20 - fd =3D socket_connect(addr, &error_abort); - g_assert_cmpint(fd, >=3D, 0); - close(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); + test); =20 - connfd =3D accept(fd, (struct sockaddr *)&un, &len); - g_assert_cmpint(connfd, !=3D, -1); - close(connfd); + 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.26.2