From nobody Fri Jun 17 19:39:15 2022 X-Original-To: dev-commits-src-branches@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 CAB7885C020; Fri, 17 Jun 2022 19:39:15 +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 4LPq9b4781z3R4k; Fri, 17 Jun 2022 19:39:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494755; 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=M9TBegDLfK8OvWY5fdrB62xz0n2AOLMyR0Xxe6kxQsk=; b=AzuzHM+LIaHSQrXCz1qcSDzT0LjXWSUfEFxA4EfBzH+mMCSIPA1fHa9ff4RXUIgRDpYOyA jWaoU5Z4FZ29qLL8XcVw2VN3OAFua11imx4BZj6kHKOPGAxFHBFWTkkVQEMbE3FDwcQrSm X5M0qRS8YAXJO0/h6ozbD3kHLDG8e3iefCagshnkTnRPjs3FzDobF+ODTt+mJLhapdhP5h ljz3tegGH886PWtZYfwJr8a8SM98crt3y+LjFadv241KDr+wL/shI2/dOVNTjW7CyfnL4A ExE/+p1ydTO0XExwwV+NVOpSin6aN2XzRiGgPOTKvdUQrM4ekKI7HW/886V0BQ== 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 2EAB925A45; Fri, 17 Jun 2022 19:39:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25HJdFD7015757; Fri, 17 Jun 2022 19:39:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25HJdFrk015756; Fri, 17 Jun 2022 19:39:15 GMT (envelope-from git) Date: Fri, 17 Jun 2022 19:39:15 GMT Message-Id: <202206171939.25HJdFrk015756@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: e4de5369401e - stable/13 - linux(4): Check that the thread tid in the thread group pid in linux_tdfind(). List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e4de5369401e6146a8f051762c1956a7c8d235da Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655494755; 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=M9TBegDLfK8OvWY5fdrB62xz0n2AOLMyR0Xxe6kxQsk=; b=cVz4AWdK7zj7K7gTWAa6e7HLs1t/FGMdiah7t60ztJlODxA+RN9vXiBGkekawwU19ReXzW 7yNeAWsAtIUjqDGfazi1SCzNAJM7I9x2h5TsBvTmJwXMd8mo3bS4h1WY2ziyN5DyV+pQkw MoBSRETm3IdCpD7UMz1Sx4mzVM2j7sAAJw2WJPSTS/MDveqtZxz4IfhP1bdsNuRZ8vcCI5 rHc9C73YANy1PibL9ABrRPCknEbx2R3hU907HLERP5kcvaM8sJS+3j9CYNtuVB2fYqB+Qh A5tCqaGEoIo1NHTrFNHpO3QF1MZudcVZR3FI7mUGEWfMulGW3PxmsAyqXY7m/w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655494755; a=rsa-sha256; cv=none; b=fYKsUQuCmR87JEY/z42E1jM2aB5Zsp6I5AIeuuDGV1evttPWp0CXewaPKoKW3M6CkvkLso QG1NBKEypJRL4b5mz3VBFdvJrTMzMJaXYFJQ5Obx8oVU6GXRGsbtCSx4I/GGjjcUSh3M5K gJMr+jNmMfF9NDXzrT/t+tHrnwk1L2EuAi92SHOx2QitvmY/QwUu1KZR3rsE7R1Nce3Rk5 vQTLXp+pLXVzyrF2wNGloOAwjuJJGGVxTS01BaZz9PHVXItm17yPd83M98Z9yKsmczkH2r 7VU8o+BL4gEh3z0hU6PaNK1q6QCtD+yAISVlzQB0KfDG1eTGyU5Oz2682QfCrw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e4de5369401e6146a8f051762c1956a7c8d235da commit e4de5369401e6146a8f051762c1956a7c8d235da Author: Dmitry Chagin AuthorDate: 2022-04-25 07:21:51 +0000 Commit: Dmitry Chagin CommitDate: 2022-06-17 19:33:54 +0000 linux(4): Check that the thread tid in the thread group pid in linux_tdfind(). MFC after: 2 weeks (cherry picked from commit fe894a370556e5b173a8893cdcde6323ff79cc57) --- sys/compat/linux/linux_misc.c | 48 +++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index b1f465ef5a9e..096bbcbf0008 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -2717,34 +2717,34 @@ linux_tdfind(struct thread *td, lwpid_t tid, pid_t pid) tdt = NULL; if (tid == 0 || tid == td->td_tid) { - tdt = td; - PROC_LOCK(tdt->td_proc); + if (pid != -1 && td->td_proc->p_pid != pid) + return (NULL); + PROC_LOCK(td->td_proc); + return (td); } else if (tid > PID_MAX) - tdt = tdfind(tid, pid); - else { - /* - * Initial thread where the tid equal to the pid. - */ - p = pfind(tid); - if (p != NULL) { - if (SV_PROC_ABI(p) != SV_ABI_LINUX) { - /* - * p is not a Linuxulator process. - */ - PROC_UNLOCK(p); - return (NULL); - } - FOREACH_THREAD_IN_PROC(p, tdt) { - em = em_find(tdt); - if (tid == em->em_tid) - return (tdt); - } + return (tdfind(tid, pid)); + + /* + * Initial thread where the tid equal to the pid. + */ + p = pfind(tid); + if (p != NULL) { + if (SV_PROC_ABI(p) != SV_ABI_LINUX || + (pid != -1 && tid != pid)) { + /* + * p is not a Linuxulator process. + */ PROC_UNLOCK(p); + return (NULL); } - return (NULL); + FOREACH_THREAD_IN_PROC(p, tdt) { + em = em_find(tdt); + if (tid == em->em_tid) + return (tdt); + } + PROC_UNLOCK(p); } - - return (tdt); + return (NULL); } void