From nobody Mon Jan 16 10:52:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NwTNy5zhqz2p3hG; Mon, 16 Jan 2023 10:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NwTNy5KdQz3wQw; Mon, 16 Jan 2023 10:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673866322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AmyIM5I1Vac9o+pMFKl2aUbErINnCvn++06QOBUA9lE=; b=P75yPCGPLz4xml6uWGzyMOD/HUvGJ7+hae6WDvKEBrWdnao1JMT98crKQN2WzNTzo1gBYt x9PiibWeUmYL1HPe4GrjA9OFvNNAajIsuo1aDDPcPsPno3TSDvN0ZScvHvj7jJlLGnO3mm XbAlN/Kei2AqbSZPEOR7QbInv30tNhjM63ZJl7DjA+lmkq55a5fMaKVHstjBdTDZOgEQi4 vCqonSkrAnh2SGLodHst7upJ0gGlQwC0LuinuZy06UvGOAqJE9Wn9lFBJj+e90GxNKmUXc Ey1vKLKskZCIhr2J8CbHkzd0aKTNm94XNYDM84SvFINf27tDHe6J6R4Ab5maeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673866322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AmyIM5I1Vac9o+pMFKl2aUbErINnCvn++06QOBUA9lE=; b=gpIE0MSTWDnOwDKIMCdf6yf4xxSvh+XOsvW/nhFwIMurIR7tTzTMrOkPPCuooTAuh7DexN 2jJwGpmZ2p0UDbsu0YYQ0VU2HfUVy38GpU265LHbAuR+a1mscJe3O+7zYZib62N1nFpkJD oFQHgufjrqOh4iHAJ3lJiv5OFq5O0jZ+mbKKkGAmerO65zeHq383GkB57ZZT89/dr+4i7w xeApohrQqD4KkRK6LzGQwZp+2BbzWaRocAXs9Rz6vUGvlIZz+XPWHgXTt+ror0HxWybmxE wESqh/eEHFQSuBFckKgPena/XbFzTNciebuzQmRxHwH5SkNKtCgefpCYwN+Ohw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673866322; a=rsa-sha256; cv=none; b=jJTc1rZT8N5C8XdN3efB8N4Y1gAMwsL3zTNgWGixFQPBs3amTJHBjNHKMbGoMWaP+2gXZJ DoH3brgfuWbdB6LQPAC4j2s7mKgz+G/M0/Bz86yv1nzcox5YdhT5aPqykFN2xY7yYWMfSx SySgmSDcsYLLp5WUwwBfyu/iCSMDepu+4kMGRLxDL8qtjvDU21ifAAQN0O9D6L7IXf2t5d gmP0I1WaS1mzNBMVUg2JrHly73H5r9NV+HpH/054y1S2CNEbNr84CXG4Tj0UUlMJ84ycRv j/b2j0UqAsSiRGDXhPC/hDPfpMkj7o8wq75XVQCYtLi1PAIWhHSZFTmvr1MVow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NwTNy466Xz14Jy; Mon, 16 Jan 2023 10:52:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30GAq2Xt033884; Mon, 16 Jan 2023 10:52:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30GAq25f033883; Mon, 16 Jan 2023 10:52:02 GMT (envelope-from git) Date: Mon, 16 Jan 2023 10:52:02 GMT Message-Id: <202301161052.30GAq25f033883@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: 42904794b804 - main - rtsock: fix socket closure. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: melifaro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42904794b80489678e8a519ba453993232b11171 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=42904794b80489678e8a519ba453993232b11171 commit 42904794b80489678e8a519ba453993232b11171 Author: Alexander V. Chernikov AuthorDate: 2023-01-15 13:40:28 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-16 10:49:45 +0000 rtsock: fix socket closure. Currently `close(2)` erroneously return `EOPNOTSUPP` for `PF_ROUTE` sockets. It happened after making rtsock socket implementation self-contained ( 36b10ac2cd18 ). Rtsock code marks socket as connected in `rts_attach()`. `soclose()` tries to disconnect such socket using `.pr_disconnect` callback. Rtsock does not implement this callback, resulting in the default method being substituted. This default method returns `ENOTSUPP`, failing `soclose()` logic. This diff restores the previous behaviour by adding custom `pr_disconnect()` returning `ENOTCONN`. Reviewed by: glebius Differential Revision: https://reviews.freebsd.org/D38059 --- sys/net/rtsock.c | 8 +++++ tests/sys/net/routing/Makefile | 1 + tests/sys/net/routing/test_rtsock_ops.c | 56 +++++++++++++++++++++++++++++++++ 3 files changed, 65 insertions(+) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index a67643e724db..4ae5c9559566 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -446,6 +446,13 @@ rts_detach(struct socket *so) so->so_pcb = NULL; } +static int +rts_disconnect(struct socket *so) +{ + + return (ENOTCONN); +} + static int rts_shutdown(struct socket *so) { @@ -2702,6 +2709,7 @@ static struct protosw routesw = { .pr_detach = rts_detach, .pr_send = rts_send, .pr_shutdown = rts_shutdown, + .pr_disconnect = rts_disconnect, .pr_close = rts_close, }; diff --git a/tests/sys/net/routing/Makefile b/tests/sys/net/routing/Makefile index 45034ff211b1..7bd0b9d863f7 100644 --- a/tests/sys/net/routing/Makefile +++ b/tests/sys/net/routing/Makefile @@ -7,6 +7,7 @@ TESTSDIR= ${TESTSBASE}/sys/net/routing ATF_TESTS_C += test_rtsock_l3 ATF_TESTS_C += test_rtsock_lladdr +ATF_TESTS_C += test_rtsock_ops ATF_TESTS_PYTEST += test_routing_l3.py ATF_TESTS_PYTEST += test_rtsock_multipath.py diff --git a/tests/sys/net/routing/test_rtsock_ops.c b/tests/sys/net/routing/test_rtsock_ops.c new file mode 100644 index 000000000000..111b9edf4057 --- /dev/null +++ b/tests/sys/net/routing/test_rtsock_ops.c @@ -0,0 +1,56 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2023 Alexander V. Chernikov + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +__FBSDID("$FreeBSD$"); + +#include +#include +#include +#include + +#include + +ATF_TC(socket_rtsock_openclose); +ATF_TC_HEAD(socket_rtsock_openclose, tc) +{ + atf_tc_set_md_var(tc, "descr", "test successful open/close"); +} + +ATF_TC_BODY(socket_rtsock_openclose, tc) +{ + int s = socket(PF_ROUTE, SOCK_RAW, 0); + ATF_CHECK(s >= 0); + ATF_CHECK_ERRNO(0, close(s) == 0); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, socket_rtsock_openclose); + + return (atf_no_error()); +}