From: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Date: Mon, 30 Mar 2026 07:07:57 +0000 (+0200)
Subject: timens: Use mutex guard in proc_timens_set_offset()
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d89dc8b1c559ee2662db86f7490ac52cab3030c;p=thirdparty%2Fkernel%2Flinux.git

timens: Use mutex guard in proc_timens_set_offset()

Simplify the logic in proc_timens_set_offset() by converting the mutex
usage to a guard().

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
Signed-off-by: Thomas Gleixner <tglx@kernel.org>
Link: https://patch.msgid.link/20260330-timens-cleanup-v1-3-936e91c9dd30@linutronix.de
---

diff --git a/kernel/time/namespace.c b/kernel/time/namespace.c
index 37495bde92a40..084ceec354959 100644
--- a/kernel/time/namespace.c
+++ b/kernel/time/namespace.c
@@ -270,7 +270,7 @@ int proc_timens_set_offset(struct file *file, struct task_struct *p,
 	struct time_namespace *time_ns __free(time_ns) = NULL;
 	struct ns_common *ns = timens_for_children_get(p);
 	struct timespec64 tp;
-	int i, err;
+	int i;
 
 	if (!ns)
 		return -ESRCH;
@@ -307,13 +307,10 @@ int proc_timens_set_offset(struct file *file, struct task_struct *p,
 			return -ERANGE;
 	}
 
-	mutex_lock(&timens_offset_lock);
-	if (time_ns->frozen_offsets) {
-		err = -EACCES;
-		goto out_unlock;
-	}
+	guard(mutex)(&timens_offset_lock);
+	if (time_ns->frozen_offsets)
+		return -EACCES;
 
-	err = 0;
 	/* Don't report errors after this line */
 	for (i = 0; i < noffsets; i++) {
 		struct proc_timens_offset *off = &offsets[i];
@@ -331,10 +328,7 @@ int proc_timens_set_offset(struct file *file, struct task_struct *p,
 		*offset = off->val;
 	}
 
-out_unlock:
-	mutex_unlock(&timens_offset_lock);
-
-	return err;
+	return 0;
 }
 
 const struct proc_ns_operations timens_operations = {