From nobody Fri May 3 00:26:05 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 4VVs6P5kX3z5KL02; Fri, 3 May 2024 00:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VVs6P5DR7z4f9m; Fri, 3 May 2024 00:26:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1714695965; 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=xV4ysH7GOT02QApN9FWzEdCieG0BSr4EadVTGbU8JWc=; b=CqYQBZnYEzZ4El/ssa/BfrN4T0EL4880KiW1Q+yqVR6h72OZMQNzjMDHtuOSpky/MSG5DY QlY0ZNmV/3hH2pG67c8HVMddH4/9B/0aZ66HN8SCw5tGYOsGUXggUGkjj2xJjGq/IVDe1V BMVbcCIKL2AfGx6lmvbjErxlCx5DairvTj/dwGePAUbdQL5MPQzauBc0VWlOLJE/vaVYHh Szu1gFh1K5QV5HdTfokpBtj78TsmGX7cVcPttrI6V5u0NEgCfymVdeibQtdo4jWYXWvTww OZtKAy/ZVb3GfSOLwkwcumH1KrLD6lk6RpVkFWPmU+pMjprIoWRyhZ0InuOyFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1714695965; a=rsa-sha256; cv=none; b=G5BTyEv2D1pE8PFJFRhmQEAs0G9ZoIKgxLJhBJj9iKwN9qehDZLooiImul/sYep3PfK+Us RfOI2nJERd+MURq8HXxeQuSjJk6l7wUoz8QIdj+ysWrFfWWFBj3ZNiuOdCeL52RHAtE3eP RvJZScZMiF6md1MxbpCImHKiCTm44pwy62eEULss0re+HHtpBWwwaaSeVe381OkfBDwEBq 5rTJuha+zcFGcpmlymPWXhnM+mU8GSjjME+UiRy+PODfdPdcJuB3sLsLC4NgunV68Q26TM 82pf6Zj2sZsOcnMHvL/YJ/ehk6cQ1qC0BvzB125ycCi2ufFtx5z1ksmB2kkYvQ== 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=1714695965; 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=xV4ysH7GOT02QApN9FWzEdCieG0BSr4EadVTGbU8JWc=; b=koX4TrV3eTirJX7EAtagFZ1Hm8S92TawUpPEDzcirEt08DVy0biAa34ybb/hSPy/92WZD8 V3bSg+fs4I8hqw8yh6tGdA7xa6FaD5IYXxQHqGNZxFxNQMYBRXwebZrzriBwy3byNduxET wyvtsYIxa8w5ZQNZQNBmB/0g5sf6TRqRJ+Val8jPZoT5B71bPOHQjDItrDXKGeeuVUp0cB Mz1GRM8CoXm0OsWMy14SMWUju8dKY5HU0enhhiBTRzSp27EmjcgPPX6ReMYgth2bgtLKiO eBKtO2sDeTlA7UoT3EGQ1qNLyMao6h/HczYElsg5P4pCaKB7EHinVF/UBuITdQ== 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 4VVs6P4qbHzP1h; Fri, 3 May 2024 00:26:05 +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 4430Q51k097396; Fri, 3 May 2024 00:26:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4430Q5Cd097393; Fri, 3 May 2024 00:26:05 GMT (envelope-from git) Date: Fri, 3 May 2024 00:26:05 GMT Message-Id: <202405030026.4430Q5Cd097393@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: 66e0bf766854 - stable/14 - 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/14 X-Git-Reftype: branch X-Git-Commit: 66e0bf7668548f3bb98dfaf92938b7ebf953b5d2 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=66e0bf7668548f3bb98dfaf92938b7ebf953b5d2 commit 66e0bf7668548f3bb98dfaf92938b7ebf953b5d2 Author: Konstantin Belousov AuthorDate: 2024-04-29 18:51:53 +0000 Commit: Konstantin Belousov CommitDate: 2024-05-03 00:25:33 +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 f3fd39079a82..dd845e653929 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -2094,11 +2094,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