From nobody Sun Jun 21 11:48:05 2026 X-Original-To: dev-commits-src-main@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 4gjqMn4VDzz6jZh2 for ; Sun, 21 Jun 2026 11:48:05 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gjqMn28p7z3W70 for ; Sun, 21 Jun 2026 11:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782042485; 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=PmHYAnJStQIa1uTTMaM48B+CxLAw4WGcZOM0PWfQbNA=; b=WFzOLVA1nFC3RNLcm2ofoBUtyLET9H4z7s1voQDW3OEmXz/vcO37wRPRUQfr1+mOvlkvdj zd/hXYwIDLBXGsFR5G2pqqu4lbNfmzecrJ9IJ4Dd8qijnzd2mVgKOGKLPig6tVeDQlwuD7 cQt2iucoFsTVB4RD9dvH9afYM5Rs0YRWtGj7m7OUd1iFE7VlseLztoALrBzJjPQujJY2pr 6e1m4aNeZTCTQGPOSrGBDSGfjn5+ZSHmdTR3+mxkPIhgokfizdJZJw1w2uIr3NLOC706eV XstFfM0tk+8mrfR1ZuhjH7KPWCOxVPzjcjSRKM/jvJ5R4xviTd1ep3R3CJd4PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782042485; a=rsa-sha256; cv=none; b=jjrMtFe0nAL54eq3HZkm6UAo/fgzbeB4iXv4PPq6KoRTvvSYl5fCqMfDhF9oy/272gE1OM bZopg0RhcHfJRDnJFtv062OcH00cQkqCI/rzoi0GwEFmNTlSSos2kPYfVjFUZJI/qbKi/v tva5LP0QnC6KTXnGnC+PWnUnt5ynO3sC30Pd01wIwg0pwdTenTDA3zISo6p2JRp6UTesNb hJahKtqDONUb5+8a5N1X7/UyerSnHJvjsiIiUNFoKv7QAOrP7yJVWw2P/zatfv0wgECD9f 8WcF3iC9/NI2kQnx4zZRRlfOsEUX2lQsy4mOxYDmUt/2hXhxI6orm6zTav+nrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782042485; 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=PmHYAnJStQIa1uTTMaM48B+CxLAw4WGcZOM0PWfQbNA=; b=a1hu8q6s1F3YYZo/GIZdaS/naMeb0YXwApM04gjdeA4KhjLfL5YodKcEwYo2n64BHBrGq7 /wDOpkZ+ozw56joH+JKMveWJ0m11KFxcammrxcN8T29x3MfzCuaJExhn1F/XEUFAjeKNcq sUcvhxM8tnbWVy42N1r4jivuMOa1aKkEWBpo38M2NWjjDInvrPqMOfNLo3s5zwRU87EhmB E9jbH20GnYb3qfzLfQl8uaIiUo54842VH2CsctQagv/iwnP4aWYSKe8Ybga0DHrbgtrhlU Tf9Pee6yduLoiPN7lEmMagzxuxY7BGQl4dP7S9ZpJPE/z2s1GDkmGAY0WrulLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gjqMn0yjPz1F5P for ; Sun, 21 Jun 2026 11:48:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 26859 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 21 Jun 2026 11:48:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 80626f34ee98 - main - kern_proc.c: make kern.proc.osrel atomic 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 80626f34ee985671bb8c60ee986b89587b7a1511 Auto-Submitted: auto-generated Date: Sun, 21 Jun 2026 11:48:05 +0000 Message-Id: <6a37cf75.26859.23f760df@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=80626f34ee985671bb8c60ee986b89587b7a1511 commit 80626f34ee985671bb8c60ee986b89587b7a1511 Author: Konstantin Belousov AuthorDate: 2026-06-15 17:28:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-21 11:46:53 +0000 kern_proc.c: make kern.proc.osrel atomic Reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D57497 --- sys/kern/kern_proc.c | 45 ++++++++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 23 deletions(-) diff --git a/sys/kern/kern_proc.c b/sys/kern/kern_proc.c index a42d528cc9c1..17b4effde030 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -3121,39 +3121,38 @@ sysctl_kern_proc_osrel(SYSCTL_HANDLER_ARGS) int *name = (int *)arg1; u_int namelen = arg2; struct proc *p; - int flags, error, osrel; + int flags, error, old_osrel, osrel; if (namelen != 1) return (EINVAL); - if (req->newptr != NULL && req->newlen != sizeof(osrel)) - return (EINVAL); - - flags = PGET_HOLD | PGET_NOTWEXIT; - if (req->newptr != NULL) + flags = PGET_NOTWEXIT; + if (req->newptr != NULL) { + if (req->newlen != sizeof(osrel)) + return (EINVAL); + error = SYSCTL_IN(req, &osrel, sizeof(osrel)); + if (error != 0) + return (error); + if (osrel < 0) + return (EINVAL); flags |= PGET_CANDEBUG; - else + } else { flags |= PGET_CANSEE; + } error = pget((pid_t)name[0], flags, &p); if (error != 0) return (error); - - error = SYSCTL_OUT(req, &p->p_osrel, sizeof(p->p_osrel)); - if (error != 0) - goto errout; - - if (req->newptr != NULL) { - error = SYSCTL_IN(req, &osrel, sizeof(osrel)); - if (error != 0) - goto errout; - if (osrel < 0) { - error = EINVAL; - goto errout; - } - p->p_osrel = osrel; + if ((p->p_flag & P_INEXEC) != 0) { + error = EBUSY; + } else { + old_osrel = p->p_osrel; + if (req->newptr != NULL) + p->p_osrel = osrel; } -errout: - PRELE(p); + PROC_UNLOCK(p); + + if (error == 0) + error = SYSCTL_OUT(req, &old_osrel, sizeof(old_osrel)); return (error); }