From nobody Mon Aug 7 14:24:20 2023 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 4RKJVF1vxhz4phfg; Mon, 7 Aug 2023 14:24:21 +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 4RKJVF104mz4LJm; Mon, 7 Aug 2023 14:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418261; 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=tUGH38gMdjKmOtb67ezXCIpCAOHk9XOvwiWKbx2E4Yk=; b=eV7QYyXC1paYosTSvnFb9WN9eSvY9a1/Etju9FoyLs8Zz9quUKgJd5IWzdIHVA0YVRcofq BdT+OJYRr1G3Po5wHhLI1RLo8qbtpevWu5alc6KX35DU8bPU4NWImhDD1L1VilpdgN0y0m ++QrYWq94C6KHNAaEnatNFNoV4Mi+0LU0STEpC8SMUAg3BhrFF9tGpW4mZPI7rB68RbnVw qU8Abk3k5t0e3lgbx7JTvdWQXROqBmnz5o1JFZeD98SZrGy8Yje94UXiJIWIs0HAPQM35H NEIYKNssDZEwLv/QhKHjf3xZdyxgNFStDEFqOQJalGJKKaUuYMxooKcPwEFOIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418261; 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=tUGH38gMdjKmOtb67ezXCIpCAOHk9XOvwiWKbx2E4Yk=; b=fysCbsrREuB9WdA5p1etK8OCtWsFUOaTPFF5gaNcRduDRnMm19/r9qdAg+d+VJAyCfANud osGX5O7scyUTT2DIMWXK8BSfyfETnYPYFXq6V2t7J2g9D2z/p6eYw3Uxv2Zt6y4rIyuZ92 0ZrVlMw/aGKrnLP/2bcefMmPkXAsrEOvZyjuaBPdnEQgjh7EaLEF0ye4fdJ9y/pHPfyibc nutln1cymVzK/aFVpq7oITypIMh1afQZIme3qyR8PmvYagSmWt5SaBhf0yDfz+bdi8eUSa IGZuxQWMNrsSus+NGljyXqPgpK+cWx7Sl9Sd8+5s9pFU38/hqw3x8+4M3tMiBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418261; a=rsa-sha256; cv=none; b=HTc4+VRlU2ZVrZ7vVClXejVKkUNWdPz2XJolgXM9LOqvevjFvKEQRN8l5CDCQXBWZJkH/g xmYUD6SmnzlyMcwA8MyoxKtjz+HeYmYOXTQTL/bx7Ub+DNaBHJuU76iHr6gkmpU213ggDj kIiz1sVqYFs4jML8ZUfaqgeQw4oGFvrZ7bghUCJrNAWB0EaNHDyPuW/t4nHuRvnuzZDl7H KIbDu3SUWXspvFUWNdY48xAzFpPXLLixTq4StehUGa+3TwKsK7i4H/JSj5uvA0xkeZ/Rqr RObat7BNY+A2ADPoD1ofJe/J+fPJ2fgjCxCi1UfNQNvaVQ+9cahSxUGbcgECvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RKJVF03rNzvnS; Mon, 7 Aug 2023 14:24:21 +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 377EOKRM025932; Mon, 7 Aug 2023 14:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOKHM025931; Mon, 7 Aug 2023 14:24:20 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:20 GMT Message-Id: <202308071424.377EOKHM025931@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: 76efe26bafe2 - stable/13 - linux(4): Use M_LINUX for malloc type of proc emuldata 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: 76efe26bafe2632a84e14451b9d04726edf942fb Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=76efe26bafe2632a84e14451b9d04726edf942fb commit 76efe26bafe2632a84e14451b9d04726edf942fb Author: Dmitry Chagin AuthorDate: 2023-07-18 21:44:17 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-07 14:22:59 +0000 linux(4): Use M_LINUX for malloc type of proc emuldata MFC after: 2 weeks (cherry picked from commit b834497c6d0cccaeebad8d94a32c8dd3ec0d3f9b) --- sys/compat/linux/linux_emul.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index ab877116b9fc..f6c071c9fb4a 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -147,7 +147,7 @@ linux_proc_init(struct thread *td, struct thread *newtd, bool init_thread) p = newtd->td_proc; /* non-exec call */ - em = malloc(sizeof(*em), M_TEMP, M_WAITOK | M_ZERO); + em = malloc(sizeof(*em), M_LINUX, M_WAITOK | M_ZERO); if (init_thread) { LINUX_CTR1(proc_init, "thread newtd(%d)", newtd->td_tid); @@ -281,7 +281,7 @@ linux_common_execve(struct thread *td, struct image_args *eargs) p->p_emuldata = NULL; PROC_UNLOCK(p); - free(em, M_TEMP); + free(em, M_LINUX); free(pem, M_LINUX); } return (EJUSTRETURN); @@ -353,7 +353,7 @@ linux_thread_dtor(struct thread *td) LINUX_CTR1(thread_dtor, "thread(%d)", em->em_tid); - free(em, M_TEMP); + free(em, M_LINUX); } void