Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Eiichi Tsukata <eiichi.tsukata@nutanix.com>
To:     paul@paul-moore.com, eparis@redhat.com,
        linux-kernel@vger.kernel.org, audit@vger.kernel.org
Cc:     Eiichi Tsukata <eiichi.tsukata@nutanix.com>
Subject: [PATCH v2 2/2] audit: replace auditd_conn.pid with auditd_pid
Date:   Tue, 18 Apr 2023 11:09:19 +0000
Message-Id: <20230418110919.221578-3-eiichi.tsukata@nutanix.com>
In-Reply-To: <20230418110919.221578-1-eiichi.tsukata@nutanix.com>
References: <20230418110919.221578-1-eiichi.tsukata@nutanix.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/ahi1DH1UNXmls6Jtc2Ghcu4XjBY2VdjbzhlgTZNRfGprJuZCAmogrjvd+DE?=
 =?us-ascii?Q?CTY+KHlzkUVO0pNtaz2vzTdCiWzPy9J2sQauqg6qhhak8t8w8EbWYw39n8MC?=
 =?us-ascii?Q?oDdFe/jp6BqesHmg+zv1WXLZj52vGjezfFgnlVAWYRSS4NcPPrQF4VmqNiJx?=
 =?us-ascii?Q?xNRLIwDF706TyVOo1iExJQMDisNxiTKJNoezrJXohwKRwQByE9guHt97Hll7?=
 =?us-ascii?Q?8+GNI6brlhDCvzZjzsUaaKlaPlzhYzJ8HVJM9sWPugKU803MTe+PjFzugm86?=
 =?us-ascii?Q?+6vV3xpnDL8Lpg8r9s4EZIx64eQz5dbeaBChIVfEQV3n0tpq4JOUg//NQ1uW?=
 =?us-ascii?Q?2oIWh9hWBBajVDfW8l5YxUQcUsNmYV2rCpUiu+G4SlcvyIEK6bcaZ8tXXBSo?=
 =?us-ascii?Q?slvOU7oGFsp1awD7AIbjz1vdYf/Mgvx1NDYyAOcNPeP5A6W82YSoY1p52/xY?=
 =?us-ascii?Q?NRUXZjuxvX3UEz7KbaK6lgow0Jc51oMAvX/Kwp5zgpvoE6OQULe9Xjy+xZXm?=
 =?us-ascii?Q?8d8Ea30K2SKcdIen5KwEmDtb8jquro0rw7bayo5Y8gngz1/o6jm9kHb/B198?=
 =?us-ascii?Q?WL5Gkf6YLx5EBDJu4OZmCI6RlDnG0WJR0WIqIHlYJgl+nCp0Eus+oLg591lI?=
 =?us-ascii?Q?7rgVMfaR+wyxAXPeBwDzx4Ie2I6NRcsh0noAS3WyrOZHyJUca4XghbP7lZcZ?=
 =?us-ascii?Q?o4/4Udj5+EWAMWljBcaFN5e2Bbmvht6klt6PcvVVdfha2FYY1FPLs6oxW46Z?=
 =?us-ascii?Q?ijkMXF+l2CVEUJAn9sOrIuM2ruDF32ryFpwBOSYhVQBrxs81SHnxhhBlvksy?=
 =?us-ascii?Q?T4NzEp8vGyDhEMfQSXNzrA4mMTPxd/BynieSM50rDRXxvHf+SI9sEqtyEK9w?=
 =?us-ascii?Q?SpqIezYVqHKz3VHHEOcI6Z6j4H9myzOOc+kDv5NcvrOUOHF7YSn4o0FUlxYA?=
 =?us-ascii?Q?i5Iy8uj6dj/OslrOX5sG/QrqC5nUB2dGcSMmnj+BiTB2Lp1VvSfalqJ16sHy?=
 =?us-ascii?Q?11FKw916DNfKaQfqj7fnvpFwUHDS1xrhj623mvF7YLASHFlYKrRu6h7MgbZV?=
 =?us-ascii?Q?KSSGHkfp4S5GarO4YusGQfAP8Cy5dFNPHeuH72JsBNmQgpXNLQE2Esk62o+u?=
 =?us-ascii?Q?/SlBoe+RVdiBM3KFRQn9XjCu9LeqfDzZeHD2PltZDTliAA96KUVgnAaQ+GFJ?=
 =?us-ascii?Q?bkMFVMtD3dO0097SA5xb5FqIQ98yJQ+JuCy9nwehAE/WhDdHT89r78TdsPLI?=
 =?us-ascii?Q?sTYvxuQHwQSlPHl6aAXgP4bLUI2lPuk8DZ/G4Nq5Ec/CKWhrulR23kBgGwBa?=
 =?us-ascii?Q?Kif6xrqsiUCZ6Ssaw1vu8kZ2gmaz7JVdlkgW2fUxfyGV7PvOJzcDoLiAMRJu?=
 =?us-ascii?Q?Gy6Kg7YPUW8kGZZcIr+5DfLA3aub6EDvCkA1Ryo6fIIThexIkskJZiCD7lPv?=
 =?us-ascii?Q?T93kJcFK/CzzZjuPJMxttqo/A3IybedFK/yfmeTeWs1NXu1mJTKtHHw/MfPN?=
 =?us-ascii?Q?tDWP1hsJ5r7JKwuQk8bWdJqlmPJ34Zo8mUnZfS08CTf0gIdwPzfLTp0YwrWA?=
 =?us-ascii?Q?43IgDUxrJ2OLdKvk6CB7fBrPLr2KuKQ6UjqQGMpkzXHODsbVn1lfSu/iF+63?=
 =?us-ascii?Q?rw=3D=3D?=
X-OriginatorOrg: nutanix.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 6e9b389e-bdc8-4a34-bd11-08db3ffd768a
X-MS-Exchange-CrossTenant-AuthSource: CH0PR02MB8041.namprd02.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2023 11:10:05.2861
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: bb047546-786f-4de1-bd75-24e5b6f79043
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: zUWAvhOZnIe7HF9dVv9i+tKCA/1QPfeXljcEIjlvtOj60+vhCksYc6eccxYlrxGCm8nXMR4iAAy646d/2y/FZNysZkQ80Ptng2cFlE+V2Jg=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH0PR02MB8421
X-Proofpoint-GUID: VBQc-oM5cSyuE4b80kQn-xANl-asI79A
X-Proofpoint-ORIG-GUID: VBQc-oM5cSyuE4b80kQn-xANl-asI79A
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-04-18_07,2023-04-18_01,2023-02-09_01
X-Proofpoint-Spam-Reason: safe
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,
        SPF_NONE,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

auditd_conn.pid is redundant. Replace it with auditd_pid.

Signed-off-by: Eiichi Tsukata <eiichi.tsukata@nutanix.com>
---
 kernel/audit.c | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/kernel/audit.c b/kernel/audit.c
index 9426980368e4..72a7397eaa89 100644
--- a/kernel/audit.c
+++ b/kernel/audit.c
@@ -94,7 +94,6 @@ struct audit_net {
 
 /**
  * struct auditd_connection - kernel/auditd connection state
- * @pid: auditd PID
  * @portid: netlink portid
  * @net: the associated network namespace
  * @rcu: RCU head
@@ -104,7 +103,6 @@ struct audit_net {
  * or the associated spinlock for writing.
  */
 struct auditd_connection {
-	struct pid *pid;
 	u32 portid;
 	struct net *net;
 	struct rcu_head rcu;
@@ -248,15 +246,11 @@ static bool audit_ctl_owner_current(void)
 static pid_t auditd_pid_vnr(void)
 {
 	pid_t pid;
-	const struct auditd_connection *ac;
+	unsigned long flags;
 
-	rcu_read_lock();
-	ac = rcu_dereference(auditd_conn);
-	if (!ac || !ac->pid)
-		pid = 0;
-	else
-		pid = pid_vnr(ac->pid);
-	rcu_read_unlock();
+	spin_lock_irqsave(&auditd_conn_lock, flags);
+	pid = auditd_pid ? pid_vnr(auditd_pid) : 0;
+	spin_unlock_irqrestore(&auditd_conn_lock, flags);
 
 	return pid;
 }
@@ -459,7 +453,6 @@ static void auditd_conn_free(struct rcu_head *rcu)
 	struct auditd_connection *ac;
 
 	ac = container_of(rcu, struct auditd_connection, rcu);
-	put_pid(ac->pid);
 	put_net(ac->net);
 	kfree(ac);
 }
@@ -478,6 +471,7 @@ static int auditd_set(struct pid *pid, u32 portid, struct net *net)
 {
 	unsigned long flags;
 	struct auditd_connection *ac_old, *ac_new;
+	struct pid *auditd_pid_old;
 
 	if (!pid || !net)
 		return -EINVAL;
@@ -485,7 +479,6 @@ static int auditd_set(struct pid *pid, u32 portid, struct net *net)
 	ac_new = kzalloc(sizeof(*ac_new), GFP_KERNEL);
 	if (!ac_new)
 		return -ENOMEM;
-	ac_new->pid = get_pid(pid);
 	ac_new->portid = portid;
 	ac_new->net = get_net(net);
 
@@ -493,9 +486,11 @@ static int auditd_set(struct pid *pid, u32 portid, struct net *net)
 	ac_old = rcu_dereference_protected(auditd_conn,
 					   lockdep_is_held(&auditd_conn_lock));
 	rcu_assign_pointer(auditd_conn, ac_new);
-	WRITE_ONCE(auditd_pid, ac_new->pid);
+	auditd_pid_old = auditd_pid;
+	WRITE_ONCE(auditd_pid, get_pid(pid));
 	spin_unlock_irqrestore(&auditd_conn_lock, flags);
 
+	put_pid(auditd_pid_old);
 	if (ac_old)
 		call_rcu(&ac_old->rcu, auditd_conn_free);
 
@@ -623,6 +618,7 @@ static void auditd_reset(const struct auditd_connection *ac)
 	unsigned long flags;
 	struct sk_buff *skb;
 	struct auditd_connection *ac_old;
+	struct pid *auditd_pid_old;
 
 	/* if it isn't already broken, break the connection */
 	spin_lock_irqsave(&auditd_conn_lock, flags);
@@ -634,9 +630,11 @@ static void auditd_reset(const struct auditd_connection *ac)
 		return;
 	}
 	rcu_assign_pointer(auditd_conn, NULL);
+	auditd_pid_old = auditd_pid;
 	WRITE_ONCE(auditd_pid, NULL);
 	spin_unlock_irqrestore(&auditd_conn_lock, flags);
 
+	put_pid(auditd_pid_old);
 	if (ac_old)
 		call_rcu(&ac_old->rcu, auditd_conn_free);
 
-- 
2.39.2