KztvmsdMTVX75ZeosXiqv3hcARzl3Qvq5LGlx5BdSQDqbabgjqeFK6ZapOCbBJPWeWZ Fm19Sn4RaSlwVRx4x3CKd5NSwtmz76KELBaoN5+Yd9uUNDC+MgFpdzIQMy4IdJLeH8Cih7 kopw8Q/f5TTYJe7K+JOy6CIfvxTC0ZEy+cPTEVe7MSVSXLBWGoXpmPJg63YBJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738716880; a=rsa-sha256; cv=none; b=Ck7/aZCq+ned1zBFmimIHW0WDB9eBrCWg4eZKz5jgXfHfk/dUBBPwq2ZkR9KcK5aWKsFKE Ycu0M60yWVvDL426bJC6YkhaC6hiiymDFVvgoHBrGSh7Rkd2LjUWI4xsbJW5p2Nz2fkfp1 QPnzIdtD6oFNPqVV2bHvwQ3FYl2APuRyVywiIy2jA0dQpNZ6lbFjdfb8rH5v2PAGY85GIi scg804R8JdqRQenDdIBgws1jZ4e+hYXbMkHwnKE9HV65e3jE8tPyNBJg7IL4ts63dr4KKh CVK2FYIVg03j43FgMIca+NmJ9cP1wir5Hyn54rUYdiYSQP0KABYEw5Fv1UvoZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4Ynhb40QnQzTVl; Wed, 05 Feb 2025 00:54:40 +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 5150sdD5050826; Wed, 5 Feb 2025 00:54:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5150sdb2050823; Wed, 5 Feb 2025 00:54:39 GMT (envelope-from git) Date: Wed, 5 Feb 2025 00:54:39 GMT Message-Id: <202502050054.5150sdb2050823@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: ef3991d70dca - main - netlink: don't store an extra pointer to so_cred List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef3991d70dcacb419fbdc845a19ed6d646ebccd5 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=ef3991d70dcacb419fbdc845a19ed6d646ebccd5 commit ef3991d70dcacb419fbdc845a19ed6d646ebccd5 Author: Gleb Smirnoff AuthorDate: 2025-02-05 00:36:14 +0000 Commit: Gleb Smirnoff CommitDate: 2025-02-05 00:54:21 +0000 netlink: don't store an extra pointer to so_cred --- sys/netlink/netlink_domain.c | 2 -- sys/netlink/netlink_glue.c | 4 ++-- sys/netlink/netlink_var.h | 1 - 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/netlink/netlink_domain.c b/sys/netlink/netlink_domain.c index e71ea1ce1e09..e06c0bf1919e 100644 --- a/sys/netlink/netlink_domain.c +++ b/sys/netlink/netlink_domain.c @@ -328,8 +328,6 @@ nl_attach(struct socket *so, int proto, struct thread *td) TAILQ_INIT(&so->so_snd.nl_queue); so->so_pcb = nlp; nlp->nl_socket = so; - /* Copy so_cred to avoid having socket_var.h in every header */ - nlp->nl_cred = so->so_cred; nlp->nl_proto = proto; nlp->nl_process_id = curproc->p_pid; nlp->nl_linux = is_linux; diff --git a/sys/netlink/netlink_glue.c b/sys/netlink/netlink_glue.c index 0e8fdc0b054c..4b593fd9657b 100644 --- a/sys/netlink/netlink_glue.c +++ b/sys/netlink/netlink_glue.c @@ -85,13 +85,13 @@ struct rtbridge *netlink_callback_p = &ignore_cb; bool nlp_has_priv(struct nlpcb *nlp, int priv) { - return (priv_check_cred(nlp->nl_cred, priv) == 0); + return (priv_check_cred(nlp->nl_socket->so_cred, priv) == 0); } struct ucred * nlp_get_cred(struct nlpcb *nlp) { - return (nlp->nl_cred); + return (nlp->nl_socket->so_cred); } uint32_t diff --git a/sys/netlink/netlink_var.h b/sys/netlink/netlink_var.h index 11b69eb604fe..ce10a303f9f7 100644 --- a/sys/netlink/netlink_var.h +++ b/sys/netlink/netlink_var.h @@ -69,7 +69,6 @@ struct nlpcb { bool nl_need_thread_setup; struct taskqueue *nl_taskqueue; struct task nl_task; - struct ucred *nl_cred; /* Copy of nl_socket->so_cred */ uint64_t nl_dropped_bytes; uint64_t nl_dropped_messages; CK_LIST_ENTRY(nlpcb) nl_next;