From nobody Mon Jan 23 22:12:26 2023 X-Original-To: dev-commits-src-branches@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 4P148q2zdTz2t17h; Mon, 23 Jan 2023 22:12:27 +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 4P148q1B5kz3MtV; Mon, 23 Jan 2023 22:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511947; 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=b3W5jy4aBmJ3OPmn3KlvWgj2C0RYHGGpQTKUYNIX5GA=; b=SIw0okb7OXQ/9w+jHWao8URK8XqVBb93i34guFWqUB77G9f2Ll3ow9qRegtAtfDS8Qnf2I yFSghWSWd+IlwpVYW+CzW+eIk1X3v9vxYM0K2T25ntHGLsK9wrYqKdd7E131BgZnlsJ0GO 30z/mPL8dsPGqr33c2QZOifBBy8xavJo1xD6izSDMjh/qnROW1wfFz9Z8G4CiVTkvkWB5Z eD0Z8UJKZ8kKvIu0Xlgoce8FyQ5rw5Z1AaWAIGWqUPZjdvnrarHokgonRDK8tIRXLWSfqy GyoiZH1/i4KTQxgwduUDsqkZUL1zCs04tbneKmSTY1pFyJZx6Vq1SheiL63Ohw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674511947; 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=b3W5jy4aBmJ3OPmn3KlvWgj2C0RYHGGpQTKUYNIX5GA=; b=Qu0wXxPkbqsNn+DtoszUr1GpgNzQ2oiYBekCKc33t8/uosZTViIKGO4Vzgctjk/nSWg/mh CS4vwAgYUPclTNk9+ywcZE3TQL3uTEar4Jk1u03KiKdiXkXn71IdANniJyk+6JN8orK4VY k4Uxfo8y93AJYQtlZO139kh24TcZUM+jvsBKYSNeuvx/VH4thOXSw88vC3pFm4I0RKLycs Wl40VpswQXiUVRfX3opJnRI4CSc0Z3cx3wEfgfFhRO2oHmaq9jKS6LN6ElHPj5CxiizG2h BTyPM1R/B4AJJxmlL0sAzAptlBIXcTHrjDnx2dz+Gr2MRU/GuRRB7NCJGlksow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674511947; a=rsa-sha256; cv=none; b=sEQd6JvtQw7m8rXY7vxw3A1AxvrEM9Z2Ua6heVI9fBX+KyWGYXfsBRaVAU5+ifFtjqaHqc 93EoDxrWY2KOJ/zaABXMaLg0VLX+95iozu8vmxc3w6QtJwfVTY3dEDMXgEVOf7L53u1/iW eWJnCNj26KoeRAHvwVXABVN1WXZSMAZRnlrcCIOEoJWvSoxjFDphL1diSt5aomvlXl8pty jKgTTGXhOmCQ9kEQYKdj13KXDNvcftUhertH/U225B1JJpRYoq70ez4LIf5tQCjmkFl3a1 0OyUvmj0M/Uju8KW4Q8QOZNsL0kI9fbuS/RUCsAlZN7iPd7oYWCdj80dbTY9eA== 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 4P148q0H6Fzlts; Mon, 23 Jan 2023 22:12:27 +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 30NMCQrN017466; Mon, 23 Jan 2023 22:12:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NMCQIV017465; Mon, 23 Jan 2023 22:12:26 GMT (envelope-from git) Date: Mon, 23 Jan 2023 22:12:26 GMT Message-Id: <202301232212.30NMCQIV017465@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: "Alexander V. Chernikov" Subject: git: edf966085e44 - stable/13 - netlink: allow creating sockets with SOCK_DGRAM. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: edf966085e44b0aefcc8cd4f74d22b1bd09d3d60 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by melifaro: URL: https://cgit.FreeBSD.org/src/commit/?id=edf966085e44b0aefcc8cd4f74d22b1bd09d3d60 commit edf966085e44b0aefcc8cd4f74d22b1bd09d3d60 Author: Alexander V. Chernikov AuthorDate: 2023-01-21 14:36:23 +0000 Commit: Alexander V. Chernikov CommitDate: 2023-01-23 22:10:01 +0000 netlink: allow creating sockets with SOCK_DGRAM. Some existing applications setup Netlink socket with SOCK_DGRAM instead of SOCK_RAW. Update the manpage to clarify that the default way of creating the socket should be with SOCK_RAW. Update the code to support both SOCK_RAW and SOCK_DGRAM. Reviewed By: pauamma Differential Revision: https://reviews.freebsd.org/D38075 (cherry picked from commit 0079d177ab69168df5e103128a2b15bd8e74d4eb) --- share/man/man4/netlink.4 | 4 ++-- share/man/man4/rtnetlink.4 | 2 +- sys/netlink/netlink_domain.c | 16 +++++++++++++--- tests/sys/netlink/test_nl_core.py | 33 +++++++++++++++++++++++++++++++++ 4 files changed, 49 insertions(+), 6 deletions(-) diff --git a/share/man/man4/netlink.4 b/share/man/man4/netlink.4 index 2aa4903a4594..1894de5841fe 100644 --- a/share/man/man4/netlink.4 +++ b/share/man/man4/netlink.4 @@ -34,7 +34,7 @@ .In netlink/netlink.h .In netlink/netlink_route.h .Ft int -.Fn socket AF_NETLINK SOCK_DGRAM int family +.Fn socket AF_NETLINK SOCK_RAW "int family" .Sh DESCRIPTION Netlink is a user-kernel message-based communication protocol primarily used for network stack configuration. @@ -293,7 +293,7 @@ This is the default level, not impacting production performance. Socket events such as groups memberships, privilege checks, commands and dumps are logged. This level does not incur significant performance overhead. -.It Dv LOG_DEBUG9(9) +.It Dv LOG_DEBUG3(9) All socket events, each dumped or modified entities are logged. Turning it on may result in significant performance overhead. .El diff --git a/share/man/man4/rtnetlink.4 b/share/man/man4/rtnetlink.4 index dc40b277d934..5849508b74c2 100644 --- a/share/man/man4/rtnetlink.4 +++ b/share/man/man4/rtnetlink.4 @@ -34,7 +34,7 @@ .In netlink/netlink.h .In netlink/netlink_route.h .Ft int -.Fn socket AF_NETLINK SOCK_DGRAM NETLINK_ROUTE +.Fn socket AF_NETLINK SOCK_RAW NETLINK_ROUTE .Sh DESCRIPTION The .Dv NETLINK_ROUTE diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index 3b5e897164f8..de96818d5e35 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -721,13 +721,23 @@ struct pr_usrreqs nl_usrreqs = { static struct domain netlinkdomain; -static struct protosw netlinksw = { +static struct protosw netlinksw[] = { +{ .pr_type = SOCK_RAW, .pr_domain = &netlinkdomain, .pr_protocol = 0, // IPPROTO_UDP .pr_flags = PR_ATOMIC | PR_ADDR | PR_WANTRCVD, .pr_ctloutput = nl_ctloutput, .pr_usrreqs = &nl_usrreqs, +}, +{ + .pr_type = SOCK_DGRAM, + .pr_domain = &netlinkdomain, + .pr_protocol = 0, // IPPROTO_UDP + .pr_flags = PR_ATOMIC | PR_ADDR | PR_WANTRCVD, + .pr_ctloutput = nl_ctloutput, + .pr_usrreqs = &nl_usrreqs, +} }; static struct domain netlinkdomain = { @@ -736,8 +746,8 @@ static struct domain netlinkdomain = { #ifdef DOMF_UNLOADABLE .dom_flags = DOMF_UNLOADABLE, #endif - .dom_protosw = &netlinksw, - .dom_protoswNPROTOSW = (&netlinksw + 1), + .dom_protosw = &netlinksw[0], + .dom_protoswNPROTOSW = (&netlinksw[0] + 2), }; DOMAIN_SET(netlink); diff --git a/tests/sys/netlink/test_nl_core.py b/tests/sys/netlink/test_nl_core.py new file mode 100644 index 000000000000..7af421a929dc --- /dev/null +++ b/tests/sys/netlink/test_nl_core.py @@ -0,0 +1,33 @@ +import errno +import socket + +import pytest +from atf_python.sys.net.netlink import NetlinkTestTemplate +from atf_python.sys.net.netlink import NlConst +from atf_python.sys.net.vnet import SingleVnetTestTemplate + + +class TestNlCore(NetlinkTestTemplate, SingleVnetTestTemplate): + @pytest.mark.parametrize( + "params", + [ + pytest.param({"type": socket.SOCK_RAW}, id="SOCK_RAW"), + pytest.param({"type": socket.SOCK_DGRAM}, id="SOCK_DGRAM"), + ], + ) + def test_socket_type(self, params): + s = socket.socket(NlConst.AF_NETLINK, params["type"], NlConst.NETLINK_ROUTE) + s.close() + + @pytest.mark.parametrize( + "params", + [ + pytest.param({"type": socket.SOCK_STREAM}, id="SOCK_STREAM"), + pytest.param({"type": socket.SOCK_RDM}, id="SOCK_RDM"), + pytest.param({"type": socket.SOCK_SEQPACKET}, id="SOCK_SEQPACKET"), + ], + ) + def test_socket_type_unsup(self, params): + with pytest.raises(OSError) as exc_info: + socket.socket(NlConst.AF_NETLINK, params["type"], NlConst.NETLINK_ROUTE) + assert exc_info.value.errno == errno.EPROTOTYPE