From nobody Fri May 3 00:26:43 2024 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 4VVs781Zn5z5KKxl; Fri, 3 May 2024 00:26:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VVs7816LCz4fxV; Fri, 3 May 2024 00:26:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714696004; 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=/EhhDBZsQBHKtjk87XjkdSRuTcti77GY0RYsbPWBMUc=; b=i3bst8l+OQKaL9cWU8aGTgRViZXuzO7LXk4xE+YmAM/0qsWHe0iCyCMebd7WAgUmKPIeoD WASXL/jscGmC4WrRGZ0C4GBBX6JtQUE5hy98dG8CkMjQEwty4zgKtM0D0eYSAJ6eFHW8DT eSzUDOqYr79Y6DI8cviq8l1Hmp7UWAQylqGhGJagzHfXYaX7wf1if8Sa3nIqb2kZOZUO8a iwOjjl9jHvzzXbAyMZuD/AkFfrl+m3gRyjGXhOWccj9W0i+zj/P78Pd2D5y55NY8pQDIoQ nQIbHGzecT5s3BlEqmJEJUrRtAQpshuSkxukGiPIyG39uS42W12EkULMtV3kxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714696004; a=rsa-sha256; cv=none; b=sm3V9RvKTvyRpmetTb0q0V7tV+VpIKEjnFUw4aFbXGEGnYQaKlsKyJfn236nhWiKZyHyh6 jaVBgAiesrGQd/wfJIayG6w69sNMAFVbfbWzeMA+dvNiT0TWYmwcGV3Cai67dRzPvs2XmS M5sznmcepUvpMC3hRvFhZkRJsyjToAnBc7odAxO5HW1W+U5HA7/0lw/dmR15KhcN2MEaH+ 0T5o5xYyh9UB9XyAwW4e51uuB5CbipfOevhXRDjoqmFUINKZ8Iik4NxSC1/X1cKQMNpLwl p+90w1oUbD8PijRnTL5rul6fk0+N+DyeZ10pH7dnd4bNK6rlVUtFsz+BWafnHg== 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=1714696004; 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=/EhhDBZsQBHKtjk87XjkdSRuTcti77GY0RYsbPWBMUc=; b=xi+qXf+wVcw0PlLK+65c5LZAzrTgR7DmiK2zpT7VoxLeUgP/XMHP3lMtPYUHel4lBAYwdc TpTMLftuFpl993tuXscQFTQb35E10olWqa32lW42U6lXoE0KZCdEWCVyX3tiAfihKm8/uy J0kjIrjMgRB06OkAST9yqLp5orYwFHs7gRqyVrSW2Vp2LhtTIGGty93Xtu4S/GaH7KCqUb UoANLrPNXRmKjXxrdP8XJtv3aPgpmgoTnQXA2SpZmd572itRFBNxXpH88Nbw5s4Ka/QJgz /XXk201SjwHkpTKj1WD8ZliJv1HtPbcQqzPIZ5w4hZ2x18C1aLduFoyt41byOg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VVs780jxLzP8r; Fri, 3 May 2024 00:26:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4430QhDO097744; Fri, 3 May 2024 00:26:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4430QhtP097741; Fri, 3 May 2024 00:26:43 GMT (envelope-from git) Date: Fri, 3 May 2024 00:26:43 GMT Message-Id: <202405030026.4430QhtP097741@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6b667b46ab19 - stable/13 - kcmp_pget(): add an assert that we did not hold the current process 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 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/13 X-Git-Reftype: branch X-Git-Commit: 6b667b46ab192d00a280ffdab60ff523a88495e4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6b667b46ab192d00a280ffdab60ff523a88495e4 commit 6b667b46ab192d00a280ffdab60ff523a88495e4 Author: Konstantin Belousov AuthorDate: 2024-04-29 18:51:53 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-03 00:26:25 +0000 kcmp_pget(): add an assert that we did not hold the current process (cherry picked from commit 1e01650a787028fd558e8cb709c232e335fc2cd9) --- sys/kern/sys_generic.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 32f137f0cb4c..f2d099f7a0c4 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -2018,11 +2018,15 @@ kcmp_cmp(uintptr_t a, uintptr_t b) static int kcmp_pget(struct thread *td, pid_t pid, struct proc **pp) { + int error; + if (pid == td->td_proc->p_pid) { *pp = td->td_proc; return (0); } - return (pget(pid, PGET_CANDEBUG | PGET_NOTWEXIT | PGET_HOLD, pp)); + error = pget(pid, PGET_CANDEBUG | PGET_NOTWEXIT | PGET_HOLD, pp); + MPASS(*pp != td->td_proc); + return (error); } int