From patchwork Thu Sep 14 21:10:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luiz Augusto von Dentz X-Patchwork-Id: 724214 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 00C2AEEAA71 for ; Thu, 14 Sep 2023 21:10:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229588AbjINVKQ (ORCPT ); Thu, 14 Sep 2023 17:10:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34534 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229519AbjINVKP (ORCPT ); Thu, 14 Sep 2023 17:10:15 -0400 Received: from mail-pf1-x42a.google.com (mail-pf1-x42a.google.com [IPv6:2607:f8b0:4864:20::42a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 456E6269D for ; Thu, 14 Sep 2023 14:10:11 -0700 (PDT) Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-68fb2e9ebbfso1157088b3a.2 for ; Thu, 14 Sep 2023 14:10:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1694725806; x=1695330606; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=CaARLFdxTSiuKff889Y4htH9Ow1j9hK1wqAsBnI10tQ=; b=lSyda4HapucsbQBb1nTSB2OVesStCr4aPD83Bl13NTqDoLiMuEVQO0vX8JB7Yf/M7S J7mp9V5RPi9wUrURaCRHXn5GJeFtgocOW8jM7u8sCFxnotiwYUKOvHcWRR84R3OUtsEF FtYfyP8FPgn/FrcEO13IOwJDYser6b+BuWKgHVyQLhIczj41CjStm8R7AJ4Cgn+uo97M tfc4/gzJMYo6wtrzhlqYFYLtrw3tgYQP0ZuDzoEA7mKzPZopFc5Cn77q0fltRkU8iaV1 7LMK9rUP+DSasqTr/at+IjZFH9UZ8ZkHUML3uxXWiVAhE+LHJJiGJG+dpOj91tkj9C4R 8usg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694725806; x=1695330606; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CaARLFdxTSiuKff889Y4htH9Ow1j9hK1wqAsBnI10tQ=; b=KUkh660UxhurXl2s01EOpWKX21OCtHPgpnTpbegoNrfRK4lpsFFdFhsBoM7a/gJcTz FxafvoWdtadI1vMiSyR8s23jGufy4lBPea5bgJyEG1dW+s5Kv2jfMKvnARhFOjkWZDGh Cf2tIJLTS1nt9d4N0zwi3RvRlEO0Lxs+vulKce3v7q2UD1NVS5zi/+yeTnzaito1n1UX cuE0Ldh3u21IUu2hWyEgGBwq32p1RSXYzhgIqsYJAInA7Ak3MJiE6URuZ/CDJjSbJ5Hl YXWEGPUyR4ogos0O49nFfarOZoHMh8QqTygT2pTNVOJ8DlhmRvgi2Fy8eug7JmlkEN+V 8DVQ== X-Gm-Message-State: AOJu0Yx542BJToobiJmcqtRoETRLYnSFJDN6BIT0+rsizDwJEmuV+adr McHSe3B0JfD64VhWjiWQdPYOo2HlNZFxaA== X-Google-Smtp-Source: AGHT+IFryqkKvTTfczc8t/tLH5srFjDthyP41YImk7SDICgrcON+Cm1qjXg5tcaI8LO0LaFtSz8zUw== X-Received: by 2002:a05:6a20:8f1e:b0:153:a00b:dca0 with SMTP id b30-20020a056a208f1e00b00153a00bdca0mr7972591pzk.11.1694725805618; Thu, 14 Sep 2023 14:10:05 -0700 (PDT) Received: from lvondent-mobl4.. (c-98-232-221-87.hsd1.or.comcast.net. [98.232.221.87]) by smtp.gmail.com with ESMTPSA id a18-20020aa78652000000b006862b2a6b0dsm1803805pfo.15.2023.09.14.14.10.04 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 14:10:04 -0700 (PDT) From: Luiz Augusto von Dentz To: linux-bluetooth@vger.kernel.org Subject: [PATCH v2 1/2] l2cap-tester: Add tests for closing socket before connection completes Date: Thu, 14 Sep 2023 14:10:02 -0700 Message-ID: <20230914211003.3339238-1-luiz.dentz@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org From: Luiz Augusto von Dentz This adds the following tests which attempts to close/shutdown the socket before the connection completes: L2CAP BR/EDR Client - Close L2CAP LE Client - Close L2CAP Ext-Flowctl Client - Close --- tools/l2cap-tester.c | 74 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) diff --git a/tools/l2cap-tester.c b/tools/l2cap-tester.c index 141dd570c3f6..f4810e3eacea 100644 --- a/tools/l2cap-tester.c +++ b/tools/l2cap-tester.c @@ -271,6 +271,10 @@ static const struct l2cap_data client_connect_success_test = { .server_psm = 0x1001, }; +static const struct l2cap_data client_connect_close_test = { + .client_psm = 0x1001, +}; + static const struct l2cap_data client_connect_ssp_success_test_1 = { .client_psm = 0x1001, .server_psm = 0x1001, @@ -438,6 +442,10 @@ static const struct l2cap_data le_client_connect_success_test_1 = { .server_psm = 0x0080, }; +static const struct l2cap_data le_client_connect_close_test_1 = { + .client_psm = 0x0080, +}; + static const struct l2cap_data le_client_connect_adv_success_test_1 = { .client_psm = 0x0080, .server_psm = 0x0080, @@ -678,6 +686,11 @@ static const struct l2cap_data ext_flowctl_client_connect_success_test_1 = { .mode = BT_MODE_EXT_FLOWCTL, }; +static const struct l2cap_data ext_flowctl_client_connect_close_test_1 = { + .client_psm = 0x0080, + .mode = BT_MODE_EXT_FLOWCTL, +}; + static const struct l2cap_data ext_flowctl_client_connect_adv_success_test_1 = { .client_psm = 0x0080, .server_psm = 0x0080, @@ -1094,6 +1107,10 @@ static gboolean socket_closed_cb(GIOChannel *io, GIOCondition cond, { struct test_data *data = tester_get_data(); const struct l2cap_data *l2data = data->test_data; + int err, sk_err, sk; + socklen_t len = sizeof(sk_err); + + tester_print("Disconnected"); if (l2data->shut_sock_wr) { /* if socket is closed using SHUT_WR, L2CAP disconnection @@ -1107,6 +1124,20 @@ static gboolean socket_closed_cb(GIOChannel *io, GIOCondition cond, } } + data->io_id = 0; + + sk = g_io_channel_unix_get_fd(io); + + if (getsockopt(sk, SOL_SOCKET, SO_ERROR, &sk_err, &len) < 0) + err = -errno; + else + err = -sk_err; + + if (-err != l2data->expect_err) + tester_test_failed(); + else + tester_test_passed(); + return FALSE; } @@ -1454,6 +1485,38 @@ static void test_connect(const void *test_data) tester_print("Connect in progress"); } +static void test_connect_close(const void *test_data) +{ + struct test_data *data = tester_get_data(); + const struct l2cap_data *l2data = data->test_data; + GIOChannel *io; + int sk; + + sk = create_l2cap_sock(data, 0, l2data->cid, l2data->sec_level, + l2data->mode); + if (sk < 0) { + if (sk == -ENOPROTOOPT) + tester_test_abort(); + else + tester_test_failed(); + return; + } + + if (connect_l2cap_sock(data, sk, l2data->client_psm, + l2data->cid) < 0) { + close(sk); + tester_test_failed(); + return; + } + + io = g_io_channel_unix_new(sk); + g_io_channel_set_close_on_unref(io, TRUE); + data->io_id = g_io_add_watch(io, G_IO_HUP, socket_closed_cb, NULL); + g_io_channel_unref(io); + + shutdown(sk, SHUT_RDWR); +} + static void test_connect_reject(const void *test_data) { struct test_data *data = tester_get_data(); @@ -2122,6 +2185,11 @@ int main(int argc, char *argv[]) &client_connect_success_test, setup_powered_client, test_connect); + test_l2cap_bredr("L2CAP BR/EDR Client - Close", + &client_connect_close_test, + setup_powered_client, + test_connect_close); + test_l2cap_bredr("L2CAP BR/EDR Client SSP - Success 1", &client_connect_ssp_success_test_1, setup_powered_client, test_connect); @@ -2188,6 +2256,9 @@ int main(int argc, char *argv[]) test_l2cap_le("L2CAP LE Client - Success", &le_client_connect_success_test_1, setup_powered_client, test_connect); + test_l2cap_le("L2CAP LE Client - Close", + &le_client_connect_close_test_1, + setup_powered_client, test_connect_close); test_l2cap_le("L2CAP LE Client, Direct Advertising - Success", &le_client_connect_adv_success_test_1, setup_powered_client, test_connect); @@ -2233,6 +2304,9 @@ int main(int argc, char *argv[]) test_l2cap_le("L2CAP Ext-Flowctl Client - Success", &ext_flowctl_client_connect_success_test_1, setup_powered_client, test_connect); + test_l2cap_le("L2CAP Ext-Flowctl Client - Close", + &ext_flowctl_client_connect_close_test_1, + setup_powered_client, test_connect_close); test_l2cap_le("L2CAP Ext-Flowctl Client, Direct Advertising - Success", &ext_flowctl_client_connect_adv_success_test_1, setup_powered_client, test_connect);