From nobody Tue Aug 1 17:29:11 2023 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 4RFhtS4gg1z4pf64; Tue, 1 Aug 2023 17:29:12 +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 4RFhtJ1nYtz4Rj6; Tue, 1 Aug 2023 17:29:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690910952; 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=bDEQg5XyvECBzCBKmRp8CcB2Qxtk32rRkKajNpoqnvU=; b=fOCfMG5R2ENWPuZEFvhDFmcJ1pfwrqGycZnMdS63Bol5wmNg5pSKSkcVf8pOJitGP8KbCO bZVtd4s7SQUEfKq9jZPgXi61i+eTSgmlrjoMc8ZA14Z5nVHa331+9Wz6385Yo6hxc0CrLs L8y3/owo0+yDTQybJAdt8ipZ0MLoJHiwob2k08tBXCFfT+S9OPG7O/XlPdiatElT1AO0CJ 3avM+G5FulU2rDzaaInVc7AenYCvm4zuHOapXhNZjzlI04VWvMYSrrAQv6IxXXc3DfoG1a 0D5fwLEOJA4Yd4Vh27JAzX7669H8yb0BPJgUHrdBRmvvG/kEFu31DxO8dkQfMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690910952; a=rsa-sha256; cv=none; b=xBhj8pEFXLlPF8EVV8l/u5PVgVxhNlMDVoIuV6c4YnjkHlUbigmTAFwW6BGIRAsbLf2nlF TDMZQnI7MqIXv9NUwbzJbjb147HvzD6iCav0reFU/znsWTT9YfLsMq23M42jW75SQN14VZ NHckNE/31NCFSHuCkrz+bhcHYEGR9bjQP0K55tjMgYJF568v1L6nkTvKn+LS+eqC33zSig V02CpcVN6a1PMJ9DlgpbK9OvPaO2EjsstFV+iBVc1g/9SO0HWK9SyT+4XaA8gDrmjBABce bbjE+jakzbdqRLJ2CUMgGwxHz+Tu0a/2OBi57d9iUKXjldlB3yqueCchwu2SWA== 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=1690910952; 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=bDEQg5XyvECBzCBKmRp8CcB2Qxtk32rRkKajNpoqnvU=; b=yUEccb/6XFXQqyg8xktn1jGrverOuTcNmfjVi1RSlJZm8SOxCpf+qMRLQwO/gSSNw33nAJ Ha//UqZQR1Ee2xccUG8+pZSndrH3mT2DNKbvCZDiMuF/pTGjdu0DnP295BosZnGSfU02G7 PbXvsZppzyXBt+7EY8xbmqZXQ6Rr/XgWuo6Znm9EnTtFGF2AHcTo1BL3+MueQ54l8f7YS8 Yxg0GIm0YKE6H2CdgRoet3ry6fY8W9FBVGpU76BvnctlzP5sVplTsspTXBlaN9hHv+dMgk qu+xRYpiLAVJeYdRFWjJ5J1d7x7JpfLKZF6PIL3e66pv8ZAZ+RdIU7xkIAVpvg== 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 4RFhtH2KLPzmJx; Tue, 1 Aug 2023 17:29:11 +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 371HTBJs046938; Tue, 1 Aug 2023 17:29:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 371HTBqJ046937; Tue, 1 Aug 2023 17:29:11 GMT (envelope-from git) Date: Tue, 1 Aug 2023 17:29:11 GMT Message-Id: <202308011729.371HTBqJ046937@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric van Gyzen Subject: git: be1dd8e65bc6 - main - proc_detach: use ptrace(PT_KILL) to kill the tracee 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be1dd8e65bc607aae2e873ad80076a87869f6755 Auto-Submitted: auto-generated The branch main has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=be1dd8e65bc607aae2e873ad80076a87869f6755 commit be1dd8e65bc607aae2e873ad80076a87869f6755 Author: Eric van Gyzen AuthorDate: 2023-07-25 16:58:11 +0000 Commit: Eric van Gyzen CommitDate: 2023-08-01 17:28:50 +0000 proc_detach: use ptrace(PT_KILL) to kill the tracee When MFC'ing commit dad11f990e2 to stable/12, the child would dump core when dtrace exited. It was getting SIGTRAP, even though proc_detach sent a SIGKILL. I could not find the reason for this difference in behavior from main (and stable/13). The present change, however, works as expected, probably due the proc_wkilled special case in kern_ptrace. It also seems like a more obvious approach. While I'm here, fix two other issues in the previous code: It would SIGKILL a tracee even in read-only mode. It would SIGSTOP/SIGCONT the tracee if ptrace succeeded but errno happened to be EBUSY for some other reason. Reviewed by: markj MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D41122 --- lib/libproc/proc_util.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/libproc/proc_util.c b/lib/libproc/proc_util.c index 36d0de76e8fe..cd2c0dff3451 100644 --- a/lib/libproc/proc_util.c +++ b/lib/libproc/proc_util.c @@ -85,25 +85,21 @@ int proc_detach(struct proc_handle *phdl, int reason) { int status; + int request; pid_t pid; if (phdl == NULL) return (EINVAL); if (reason == PRELEASE_HANG) return (EINVAL); - if (reason == PRELEASE_KILL) { - kill(proc_getpid(phdl), SIGKILL); - goto free; - } if ((phdl->flags & PATTACH_RDONLY) != 0) goto free; + request = (reason == PRELEASE_KILL) ? PT_KILL : PT_DETACH; pid = proc_getpid(phdl); - if (ptrace(PT_DETACH, pid, 0, 0) != 0 && errno == ESRCH) - goto free; - if (errno == EBUSY) { + if (ptrace(request, pid, 0, 0) != 0 && errno == EBUSY) { kill(pid, SIGSTOP); waitpid(pid, &status, WUNTRACED); - ptrace(PT_DETACH, pid, 0, 0); + ptrace(request, pid, 0, 0); kill(pid, SIGCONT); } free: