From nobody Fri Jun 26 22:20:51 2026 X-Original-To: dev-commits-src-all@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 4gn99b6xw8z6j2hY for ; Fri, 26 Jun 2026 22:20:51 +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 4gn99b4M0zz3mJl for ; Fri, 26 Jun 2026 22:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1782512451; 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=VRXKG32rxVN4rQyg6MoHLvjD4SwTSSnhG1wedqIC0kM=; b=bLDMmLl7UxzpGxoDJMh0/PuODoHf9crwdhy8X74m9yDynf0sHup8gKaL+WbqNLIvBnUkUt fT6e4k3NUxruGoDKBYQiP3UeoGKFvelphyJ9GLZG9JmJjgDjemhx95IpVWFapejf55BxLz UPoaxjXb5HfbnS5ERVsWi092kKoxHz4FuQVff3B841tqF/XiLR+kDd19yyVmxH9+QVSPbf JqLcXd2quznepb7wUvhhPRcE+J0jP2ph/kvramTLjDqbKFVZMtcxfa/n7SbwB8pYc/gGiU P0jwlg+6/vibHp5+zIetZux3pDdU6zvefbUG49dKKIAqVLYLjKGFFwJTQfUuDw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1782512451; a=rsa-sha256; cv=none; b=ysBh+QYCrmpTlGcIt3+klvsScP9NKo1UjmXzn9O3OriLjBPUhhlJsssGkx1bwD3V9kla11 90YRrnOS2BmpOiYhoqr4icQafwXR1QTwgKy3WWDNXqK9gniMRYsG5X/ex7Tfdd3pgYvGan dsaMHa16lRZQFxi4iiad/xWQazB0BspXj4GLXydkIuTY1Cd9u1teohwzZL9t2h5o740PqZ BS+cvm+G4ZKFvLssHbWfT/jWo586Cw+LDsJ18H67kzT0q2cNDTH0CIdhnddEkZYjaESklG h6D9QnqE/9IVB1d6Ih8/VLQtxIaspXhOeF0eXBw15+AjMCM8CCiCKasu+2f3xg== 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=1782512451; 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=VRXKG32rxVN4rQyg6MoHLvjD4SwTSSnhG1wedqIC0kM=; b=SwRcRLG9sDSFtYrYyf/17LJNoJ1w83mWvrAM+X+pXcic0nTXpSIp+BKNKBgYzGVYHFkhtj LZboXaD6nryGWk4OydMcK4Jq6EFPfHbmIFdS7g7KMeni7Bhl+M6DM21ZrgjCN/T7/EQ18P +FUZVSD1UHlQYr38UvGT2m4NxRx5WyvC+2F0GSFFi6QWyETeyX7C6VEUuKzjtRF744Pvzg lMTDcHTLcE/tttn9uunRwIpAQo1EhngLXb9dpx2EJcqsnD/9dXVp3JtODrr7K7XEt077u1 +W0zcAl1Z9RfjmjaTzw+01zBquFVY5AEWcZMFYOIqB41fHUhdfgOMli7SB0PlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gn99b2xwwzxTs for ; Fri, 26 Jun 2026 22:20:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30a09 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 26 Jun 2026 22:20:51 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 5e633db3f8e1 - stable/15 - kern_proc.c: make kern.proc.osrel atomic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 5e633db3f8e126578c097c9649ba3be552664c6a Auto-Submitted: auto-generated Date: Fri, 26 Jun 2026 22:20:51 +0000 Message-Id: <6a3efb43.30a09.20dcbf35@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5e633db3f8e126578c097c9649ba3be552664c6a commit 5e633db3f8e126578c097c9649ba3be552664c6a Author: Konstantin Belousov AuthorDate: 2026-06-15 17:28:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-06-26 22:16:06 +0000 kern_proc.c: make kern.proc.osrel atomic (cherry picked from commit 80626f34ee985671bb8c60ee986b89587b7a1511) --- 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 1e09e6042e7a..056176399062 100644 --- a/sys/kern/kern_proc.c +++ b/sys/kern/kern_proc.c @@ -3123,39 +3123,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); }