git: e644694f5f3b - stable/13 - linux(4): Use M_LINUX for malloc type in getdents
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 07 Aug 2023 14:24:19 UTC
The branch stable/13 has been updated by dchagin:
URL: https://cgit.FreeBSD.org/src/commit/?id=e644694f5f3b26470e53a7856fd7de057be197cb
commit e644694f5f3b26470e53a7856fd7de057be197cb
Author: Dmitry Chagin <dchagin@FreeBSD.org>
AuthorDate: 2023-07-18 21:44:16 +0000
Commit: Dmitry Chagin <dchagin@FreeBSD.org>
CommitDate: 2023-08-07 14:22:59 +0000
linux(4): Use M_LINUX for malloc type in getdents
MFC after: 2 weeks
(cherry picked from commit 7729467781670a84059d50c4726dc94cbf4500e9)
---
sys/compat/linux/linux_file.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c
index 573c4c8a2eae..5f195e46a8a9 100644
--- a/sys/compat/linux/linux_file.c
+++ b/sys/compat/linux/linux_file.c
@@ -456,7 +456,7 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args)
size_t retval;
buflen = min(args->count, MAXBSIZE);
- buf = malloc(buflen, M_TEMP, M_WAITOK);
+ buf = malloc(buflen, M_LINUX, M_WAITOK);
error = kern_getdirentries(td, args->fd, buf, buflen,
&base, NULL, UIO_SYSSPACE);
@@ -465,7 +465,7 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args)
goto out1;
}
- lbuf = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_TEMP, M_WAITOK | M_ZERO);
+ lbuf = malloc(LINUX_RECLEN(LINUX_NAME_MAX), M_LINUX, M_WAITOK | M_ZERO);
len = td->td_retval[0];
inp = buf;
@@ -511,9 +511,9 @@ linux_getdents(struct thread *td, struct linux_getdents_args *args)
td->td_retval[0] = retval;
out:
- free(lbuf, M_TEMP);
+ free(lbuf, M_LINUX);
out1:
- free(buf, M_TEMP);
+ free(buf, M_LINUX);
return (error);
}
#endif