From nobody Thu Feb 17 13:46:20 2022 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 00BF519D545E; Thu, 17 Feb 2022 13:46:20 +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 4Jzx1m4FcZz3Pmw; Thu, 17 Feb 2022 13:46:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645105580; 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=6iA9zvAy7cLwF+hEpn6xMFqeA2epifokT81zSX8kEFs=; b=Y90drS/13aZoS2+lNilG8HXgLCF9/r4D2H/Q1PxVfSuw+l4KstujVBJrX6HC+Nx9CWZpLr FyOm/MMmQV2qz0DQtJYXPSYvknF/ABlcX9k4E8jT0gI2bmc/eTIGT17BUgQQBoLkl727g0 YY6PNp7n9Lc3Xf6JCyPu9nF69yUD4x5RML4/PgRInLVNYjo3BiZ2pfunyLGI6ExknJWHSD AdQET4c6VUQGqkTRS+SKl4zzfi1t6pcuVR5SJbsKkXKQI622y1vyXnTKMGgZdWxFwfUO0N 8pEftXwMgkLjrlY4gJu+1qpjj77FR66o+H6dcZGikg6467jVJD2PeAwBP6k24w== 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 642382B58; Thu, 17 Feb 2022 13:46:20 +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 21HDkKE4048196; Thu, 17 Feb 2022 13:46:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21HDkKwK048195; Thu, 17 Feb 2022 13:46:20 GMT (envelope-from git) Date: Thu, 17 Feb 2022 13:46:20 GMT Message-Id: <202202171346.21HDkKwK048195@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Edward Tomasz Napierala Subject: git: 3931de89e8f1 - stable/13 - linux: add support for SO_PEERGROUPS 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: trasz X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3931de89e8f110fff99f6d9f3b40ef19bf88e91c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645105580; 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=6iA9zvAy7cLwF+hEpn6xMFqeA2epifokT81zSX8kEFs=; b=X4hKQ4KGSWCWG2tOGR779zzrT/tbTcw7RzaThw3DhnMKHyIUpzbCT0tAlEXdpiM9y4EfLM k2MLRv6eWQxo4NSiwsOy8vNM6/O3I6ndCHscqskGdZExB4r2dfiiSj6O3iUvLKlBiMx9+b 9jZG7ULA/61OmMYGtJkJ8c0CWMvvsEdLlPmfxgUJ9mYJ38Q6/FwMkoJ8GePduf1EOPLpvH hu9GFsIlR1F8a0u+XfXGw1JSGeMSsP/7kffF3RtFUzW3rKG1PNRAPFp7x01I2bJOcyoi85 297kzAd1kfATSzE6QgqHqAvoyB0iPnmTywfSnyItAV0UKka/VNTlddM3C5fSDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645105580; a=rsa-sha256; cv=none; b=grOsny8PFnFeKgtYp4UkVsiVIf3psprmy9zn+Ep0XwUzPTtAfXCVskomQGh99HmfRjOTrV 4RpMLevPT+TY6pXK9/qubFuRmNx4QCFTH+Hgk+t2n8QFbFUPp+yq9uQXDW/6y8rUI5DbPL 5ganiuHuqP+kUR4oOkcFP9cDZVrM7kFAm/WkhFIZBXRrXmlB19v21wERF2ozL+U+0zD0NL gjqt/sbeH/rF7QBlt2ZQn8s0dHRYzjjwU0DkgQbfRO+V5xktUmLMGoVW85PBh9y/5Rvt/F BCrN1xBxkAOeFwQiu1kcCrh0awqH9afaBM+WjM0IHwNQykRtxlr3nnfnJeJOBg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by trasz: URL: https://cgit.FreeBSD.org/src/commit/?id=3931de89e8f110fff99f6d9f3b40ef19bf88e91c commit 3931de89e8f110fff99f6d9f3b40ef19bf88e91c Author: Edward Tomasz Napierala AuthorDate: 2021-02-07 21:29:32 +0000 Commit: Edward Tomasz Napierala CommitDate: 2022-02-13 23:18:27 +0000 linux: add support for SO_PEERGROUPS The su(8) and sudo(8) from Ubuntu Bionic use it. Sponsored By: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D28165 (cherry picked from commit cd84c82c6ad73c804b828bad9caec176e41ab79d) --- sys/compat/linux/linux_socket.c | 46 ++++++++++++++++++++++++++++++++++++++++- sys/compat/linux/linux_socket.h | 1 + 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index e9d9e3f60fcf..a2b45edf7bdc 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1867,6 +1867,43 @@ linux_setsockopt(struct thread *td, struct linux_setsockopt_args *args) return (error); } +static int +linux_getsockopt_so_peergroups(struct thread *td, + struct linux_getsockopt_args *args) +{ + struct xucred xu; + socklen_t xulen, len; + int error, i; + + xulen = sizeof(xu); + error = kern_getsockopt(td, args->s, 0, + LOCAL_PEERCRED, &xu, UIO_SYSSPACE, &xulen); + if (error != 0) + return (error); + + len = xu.cr_ngroups * sizeof(l_gid_t); + if (args->optlen < len) { + error = copyout(&len, PTRIN(args->optlen), sizeof(len)); + if (error == 0) + error = ERANGE; + return (error); + } + + /* + * "- 1" to skip the primary group. + */ + for (i = 0; i < xu.cr_ngroups - 1; i++) { + error = copyout(xu.cr_groups + i + 1, + (void *)(args->optval + i * sizeof(l_gid_t)), + sizeof(l_gid_t)); + if (error != 0) + return (error); + } + + error = copyout(&len, PTRIN(args->optlen), sizeof(len)); + return (error); +} + static int linux_getsockopt_so_peersec(struct thread *td, struct linux_getsockopt_args *args) @@ -1903,8 +1940,15 @@ linux_getsockopt(struct thread *td, struct linux_getsockopt_args *args) level = linux_to_bsd_sockopt_level(args->level); switch (level) { case SOL_SOCKET: - if (args->optname == LINUX_SO_PEERSEC) + switch (args->optname) { + case LINUX_SO_PEERGROUPS: + return (linux_getsockopt_so_peergroups(td, args)); + case LINUX_SO_PEERSEC: return (linux_getsockopt_so_peersec(td, args)); + default: + break; + } + name = linux_to_bsd_so_sockopt(args->optname); switch (name) { case LOCAL_CREDS_PERSISTENT: diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h index 71fee5f9af68..9c37d8c97c3d 100644 --- a/sys/compat/linux/linux_socket.h +++ b/sys/compat/linux/linux_socket.h @@ -199,6 +199,7 @@ int linux_accept(struct thread *td, struct linux_accept_args *args); #define LINUX_SO_SNDBUFFORCE 32 #define LINUX_SO_RCVBUFFORCE 33 #define LINUX_SO_PROTOCOL 38 +#define LINUX_SO_PEERGROUPS 59 /* Socket options */ #define LINUX_IP_TOS 1