From nobody Mon Aug 7 14:24:19 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 4RKJVD28qBz4phby; Mon, 7 Aug 2023 14:24:20 +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 4RKJVD02VVz4LTH; Mon, 7 Aug 2023 14:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418260; 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=uhw5HbH9vfsWBS0rqvY8UmgqGlN3HVX4hYtoliUXHP0=; b=xZ5b1x1994qdVlq6lnPaj6JH+JeMyeXgrNTlm08vayTfTkr5MQIbWjV4xGXXwiPqJ0Q6iB QD5oPnE7TWxDFoJ+XqpQmnhtbv5NoHUa2O1RphcBUj7FRJ5KZtDsRhFPqLgGNaSyrRmFg0 OH87hnQ0tqySLwGP4/TJFe/+XlURFPMstvqM75FurEzaiM8z2NvtRf8lwl+74vXWkLqgEE 4rddvLGZtXQ4SVrbr+85dxW+JhLKhKVAQ1Dk+WJAsLIPRJRUEfE5z/QtS9FHbNNrDCYrt/ nvjOHZueJ05/A25FVMLrn+IuJ7avK/MPcQ/Yg9jg/gwfU/gFqV5n2S/c4Ie3gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691418260; 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=uhw5HbH9vfsWBS0rqvY8UmgqGlN3HVX4hYtoliUXHP0=; b=JGdbxNVewAr1ehilN+UNWD1zsZfrX7vo0QEa35duCPaR2rP2tit55rNNVTZ3i/9ielmDi3 pPVyE29PJ8t3V5Rh8zj5t7pwR0zZ9riqOgarkROqQsFnC1CQh3EiQofs00krjNYqCIUApt LY46f5lCLCZA95ytiVuMnXSu1VQc33hr+neXBgaEi3YvIC7kVQmCHB/h6EecjvVnHEX1Ie ZDEciC0T4Yd4xHsNXWjT7AtyXW6ks4fQ9ekz0lUtbWPRnNCaDqqT4ayt/Z2ZBdcbqAYsXM rLE3UjUhRfBqIESstH2jiNKGUvs0p/CQ+9DRB8E12d0c6EowgrCeRL5f+HpX1A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691418260; a=rsa-sha256; cv=none; b=OQMBL5I1hqJ/zEip+1kJRXYcJQ5AjLtm5YG3jYLhOVkUNB8vooM3Pq6vPVVnieJdnemSk6 aaLTtGfV+4e4/U/6srgxiik7Z389wld5SJD45RMnOaG0CAP624tCXdwLdmWwpVfPhm2McE v3JRc/7Ibv5yEXBWL9u/FaQxje7NJ+yNBm8fftc2vdhUcOLeOfGxNWmmo1YSgF9IhIQjur LkZE5jSaz4dBgze9BrORLpg7zsqpYKrxXG7rRaOA9OmPL/wzRtPFsMdGu1utIV5X3iA7/x /Vk7KNV4HFjYejdRHAnkOEab7zbJgVOXtUjgQnW/fpPtfFYVLtaQWOTjegfrOA== 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 4RKJVC6G0nzwBZ; Mon, 7 Aug 2023 14:24:19 +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 377EOJo1025913; Mon, 7 Aug 2023 14:24:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 377EOJKf025912; Mon, 7 Aug 2023 14:24:19 GMT (envelope-from git) Date: Mon, 7 Aug 2023 14:24:19 GMT Message-Id: <202308071424.377EOJKf025912@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: e644694f5f3b - stable/13 - linux(4): Use M_LINUX for malloc type in getdents 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: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e644694f5f3b26470e53a7856fd7de057be197cb Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=e644694f5f3b26470e53a7856fd7de057be197cb commit e644694f5f3b26470e53a7856fd7de057be197cb Author: Dmitry Chagin AuthorDate: 2023-07-18 21:44:16 +0000 Commit: Dmitry Chagin 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