From nobody Wed Apr 1 20:39:09 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8446370D7C; Wed, 1 Apr 2026 15:16:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775056583; cv=none; b=jPdCSHrxi999IK2R81Mty+g52zf/jkzAAGZUY09Iq66cyIux25NyvKpBRfa/dMlckCljdZrIhizeibaAbk24y+E/Wk90hLb3C37lYR16LjWwwRRTeyX330ahpyPg073PPLexiBnklhEDNSsXhdtijobWe4DjXBNonjSfdxqHPM8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775056583; c=relaxed/simple; bh=GdlsAIfSDSwoxtgLmizbQYGrzA3dfZUk6zAmCt2TSJM=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=lZZrSoEkPsE1mMpRCYH/JoUUy6L0Bnv8Qg6c0bGoVFfC0du847UXUyFo5VsClzQWhqU1RKNbKljfunncRSVTPhIsCI8DUNw7ZIqTUloPRpdoIvlU2dELwb/iI6pQ4IzzvaqoqSLCVg/p4GXbLYdCWZQt1SauAIHQM3EgzXwi/q0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=NFdWwd7G; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=BkQd4Oa8; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="NFdWwd7G"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="BkQd4Oa8" Date: Wed, 01 Apr 2026 15:16:19 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1775056580; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ugHB2PE+kYImTCPZUPp6OJsspb/+KcNobG40eekE4KI=; b=NFdWwd7GY5Y+NFzJdlsAaxAzActHNrYYh8/3NUU5NIzcvi6GT6Cjd19Qpu9OjHoQcuXEdg U0C3Tak2hK7b3oktSR1No2YbuT+n4z6O6tpraiWY7a51h/dNQWjQ3UfUKKa7cMKOROV+I5 ytT0m5bC+pb3ixbcCkwe/8A5ofnd1WTtgAnOGRBQ/efH5FxfwEYseiLflr0glSp6J85ZvI cr8bqpbvQuTP4cSb+JCKjPJ6lFuTx/DAJ1jtAi1PckeGTiCipSXDXca1jhe8KlHCCzXXDb CTHqBsrMciNQ4rSqjJyM//SMeWU0i9KyzZtEbQGpf92V9ncIP+dVnb3pIqW27g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1775056580; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ugHB2PE+kYImTCPZUPp6OJsspb/+KcNobG40eekE4KI=; b=BkQd4Oa8ppsSi4f8IhcrUFXINYGyMT4V6MeFW6BTKnWey4ossk9o70LcfRdTIeRpKCKSOI 8JmUwnIEL3xppRAA== From: tip-bot2 for Thomas =?utf-8?q?Wei=C3=9Fschuh?= Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: timers/vdso] timens: Use mutex guard in proc_timens_set_offset() Cc: thomas.weissschuh@linutronix.de, Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260330-timens-cleanup-v1-3-936e91c9dd30@linutronix.de> References: <20260330-timens-cleanup-v1-3-936e91c9dd30@linutronix.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <177505657926.1647592.5188706006382517712.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the timers/vdso branch of tip: Commit-ID: 6d89dc8b1c559ee2662db86f7490ac52cab3030c Gitweb: https://git.kernel.org/tip/6d89dc8b1c559ee2662db86f7490ac52c= ab3030c Author: Thomas Wei=C3=9Fschuh AuthorDate: Mon, 30 Mar 2026 09:07:57 +02:00 Committer: Thomas Gleixner CommitterDate: Wed, 01 Apr 2026 17:13:35 +02:00 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=C3=9Fschuh Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260330-timens-cleanup-v1-3-936e91c9dd30@li= nutronix.de --- kernel/time/namespace.c | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/kernel/time/namespace.c b/kernel/time/namespace.c index 37495bd..084ceec 100644 --- a/kernel/time/namespace.c +++ b/kernel/time/namespace.c @@ -270,7 +270,7 @@ int proc_timens_set_offset(struct file *file, struct ta= sk_struct *p, struct time_namespace *time_ns __free(time_ns) =3D NULL; struct ns_common *ns =3D timens_for_children_get(p); struct timespec64 tp; - int i, err; + int i; =20 if (!ns) return -ESRCH; @@ -307,13 +307,10 @@ int proc_timens_set_offset(struct file *file, struct = task_struct *p, return -ERANGE; } =20 - mutex_lock(&timens_offset_lock); - if (time_ns->frozen_offsets) { - err =3D -EACCES; - goto out_unlock; - } + guard(mutex)(&timens_offset_lock); + if (time_ns->frozen_offsets) + return -EACCES; =20 - err =3D 0; /* Don't report errors after this line */ for (i =3D 0; i < noffsets; i++) { struct proc_timens_offset *off =3D &offsets[i]; @@ -331,10 +328,7 @@ int proc_timens_set_offset(struct file *file, struct t= ask_struct *p, *offset =3D off->val; } =20 -out_unlock: - mutex_unlock(&timens_offset_lock); - - return err; + return 0; } =20 const struct proc_ns_operations timens_operations =3D {