From nobody Thu Sep 26 06:08:44 2024 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 4XDjpP01KLz5YGlb; Thu, 26 Sep 2024 06:08:45 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XDjpN6Gxnz4mCw; Thu, 26 Sep 2024 06:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727330924; 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=MBuM2URTHhlLjATQUICETvw1Ya6wsSz+xUWJVGxpeyU=; b=LoO3OBcBlcj4v1tll7N6dXmjoZjKaWyyPcZVnGF3r75bay25tUPpa8sitHo2v1/QnYn42A mJO0T4yHxXCMZcGKZ7NsVHDQdPsRAD4mdRAfE16ocWutQ8gHKqW8BfZBTwzeDj8cUngByY vhd6RK+igrpYR4rFxZ/3NU3JPhcLWALldANxUSPubqbCAWgTLYKLDG+pLxgQ5GVx4qOg7z k7fTgGDF4da2byuXsEXdG7rAEXlenZlHzMhltMR5xDgqpaNgeleeX74H9kaD8mQdSzy1Z6 lWn+wsXkTBXPnbj/ThOLg+ZcKfHWRZ5sY6j2yO1kCPIA24Pmg2J10kqIPr1pCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727330924; 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=MBuM2URTHhlLjATQUICETvw1Ya6wsSz+xUWJVGxpeyU=; b=skCuIVPqYDnIVjaAT7BAJjrLeGvldPk/4ajmc+zi2a9FGyXiXtn1byNWbHhH4qHKmVc2vR yvxY1XItKtFkvo0gf2+xQ/mp7VFmHZQkMyo/9P2ukG3v/gWTFSxthR/IBbcpGxznN0Qa42 mH6pI6mzsQzXwwONw29tHCoCzkq7nzUPz9pAEDaIT1BnCsfUSGViUud/aG6gpoi1OIT5vH zVs67Tc/2CQbf+K43ZdhIr6OqWP9tgauALZLNtUpqvxk5eNjJQF5UYCpf6JKyI0ppHQ8qJ aRHnN2Uu5duyUtA+nhaDQCrbW+qBq9w6nc7jhTX3g606fYf0qAOChwNYfKG3ag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727330924; a=rsa-sha256; cv=none; b=m4d0dniDDrL2gqWSW4h0LQXJJIDCACx+34KTYfj2lHmudbej3PBAKFiy+nb8sXA/1I7R9I VSJbGChNjoG9CzsBJFL8Q9mSSmQPjxV/DzHLlkPzgj53UENX/EK55yx29Yn1NezjmUw//P 4amORXTB83uEKzc+fa37ImEuJt3zUwYEMyo7L5oStTkFiuR8gCfbDJ4L32rtISemdTaNVm rSyEFzPluN8ZI7I+pP9Ld+3nHcIK7HSU+Rv4yQ6uWGhFMOMCRVF+sNsJ3uUJyhBwwrjJkP Ravq9nk0PshF97yNdmrbeESvZawfr4bOcZelUMlh3N4aO0cCWNaEvpUrjSKcqg== 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 4XDjpN5sjnzlSK; Thu, 26 Sep 2024 06:08:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48Q68ihA054406; Thu, 26 Sep 2024 06:08:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48Q68iSB054403; Thu, 26 Sep 2024 06:08:44 GMT (envelope-from git) Date: Thu, 26 Sep 2024 06:08:44 GMT Message-Id: <202409260608.48Q68iSB054403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 2fb778fab893 - main - MAC: improve handling of listening sockets 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2fb778fab893b4a8a86ecfa20acf2e23bb2cdae8 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=2fb778fab893b4a8a86ecfa20acf2e23bb2cdae8 commit 2fb778fab893b4a8a86ecfa20acf2e23bb2cdae8 Author: Michael Tuexen AuthorDate: 2024-09-26 06:06:24 +0000 Commit: Michael Tuexen CommitDate: 2024-09-26 06:06:24 +0000 MAC: improve handling of listening sockets so_peerlabel can only be used when the socket is not listening. Reviewed by: markj MFC after: 1 week Sponsored by: Netflix, Inc. Differential Revision: https://reviews.freebsd.org/D46755 --- sys/kern/uipc_socket.c | 5 +++++ sys/security/mac/mac_internal.h | 1 + sys/security/mac/mac_socket.c | 19 +++++++++++++------ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index e83422e3a29f..189e8ca5b498 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -153,6 +153,7 @@ #include #include +#include #include @@ -1485,6 +1486,10 @@ solisten_proto(struct socket *so, int backlog) sbrcv_timeo = so->so_rcv.sb_timeo; sbsnd_timeo = so->so_snd.sb_timeo; +#ifdef MAC + mac_socketpeer_label_free(so->so_peerlabel); +#endif + if (!(so->so_proto->pr_flags & PR_SOCKBUF)) { sbdestroy(so, SO_SND); sbdestroy(so, SO_RCV); diff --git a/sys/security/mac/mac_internal.h b/sys/security/mac/mac_internal.h index aa407598600a..89f74a65c803 100644 --- a/sys/security/mac/mac_internal.h +++ b/sys/security/mac/mac_internal.h @@ -242,6 +242,7 @@ struct label *mac_pipe_label_alloc(void); void mac_pipe_label_free(struct label *label); struct label *mac_socket_label_alloc(int flag); void mac_socket_label_free(struct label *label); +void mac_socketpeer_label_free(struct label *label); struct label *mac_vnode_label_alloc(void); void mac_vnode_label_free(struct label *label); diff --git a/sys/security/mac/mac_socket.c b/sys/security/mac/mac_socket.c index e9f94404734a..b03f98bbfdb5 100644 --- a/sys/security/mac/mac_socket.c +++ b/sys/security/mac/mac_socket.c @@ -170,7 +170,7 @@ mac_socket_label_free(struct label *label) mac_labelzone_free(label); } -static void +void mac_socketpeer_label_free(struct label *label) { @@ -185,8 +185,10 @@ mac_socket_destroy(struct socket *so) if (so->so_label != NULL) { mac_socket_label_free(so->so_label); so->so_label = NULL; - mac_socketpeer_label_free(so->so_peerlabel); - so->so_peerlabel = NULL; + if (!SOLISTENING(so)) { + mac_socketpeer_label_free(so->so_peerlabel); + so->so_peerlabel = NULL; + } } } @@ -618,10 +620,15 @@ mac_getsockopt_peerlabel(struct ucred *cred, struct socket *so, buffer = malloc(mac->m_buflen, M_MACTEMP, M_WAITOK | M_ZERO); intlabel = mac_socket_label_alloc(M_WAITOK); SOCK_LOCK(so); - mac_socket_copy_label(so->so_peerlabel, intlabel); + if (SOLISTENING(so)) + error = EINVAL; + else + mac_socket_copy_label(so->so_peerlabel, intlabel); SOCK_UNLOCK(so); - error = mac_socketpeer_externalize_label(intlabel, elements, buffer, - mac->m_buflen); + if (error == 0) { + error = mac_socketpeer_externalize_label(intlabel, elements, buffer, + mac->m_buflen); + } mac_socket_label_free(intlabel); if (error == 0) error = copyout(buffer, mac->m_string, strlen(buffer)+1);