Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Aug 2023 14:24:20 GMT
From:      Dmitry Chagin <dchagin@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: 76efe26bafe2 - stable/13 - linux(4): Use M_LINUX for malloc type of proc emuldata
Message-ID:  <202308071424.377EOKHM025931@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/13 has been updated by dchagin:

URL: https://cgit.FreeBSD.org/src/commit/?id=76efe26bafe2632a84e14451b9d04726edf942fb

commit 76efe26bafe2632a84e14451b9d04726edf942fb
Author:     Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-07-18 21:44:17 +0000
Commit:     Dmitry Chagin <dchagin@FreeBSD.org>
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308071424.377EOKHM025931>